页面修改

src/components/FinancialModule/addFinancialProcess.vue

@@ -347,7 +347,7 @@
 					</el-form-item>
 					<el-form-item v-show="addMsg.IsShow==2" label="可显示部门">
 						<el-select filterable multiple v-model='addMsg.ShowDepartmentList' class="w200" style="max-height:100px;overflow:hidden" size="small">
-							<el-option v-for='item in DepartmentList' 
+							<el-option v-for='item in DepartmentList'
 								:label='item.DepartmentName'
 								:value='item.DepartmentID'
 								:key='item.DepartmentID'>
@@ -396,7 +396,7 @@
 					</el-form-item>
 
 				</div>
-				
+
 
 
 		<el-form-item label="排序">
@@ -405,12 +405,21 @@
         <el-form-item :label="$t('fnc.mbmiaoshu')">
 					<el-input v-model="addMsg.DescribeInfo" class="w450"  maxlength="100"></el-input>
 				</el-form-item>
+        <el-form-item label="使用端">
+					<el-select filterable multiple v-model='addMsg.PortTypeList' class="w200" style="max-height:100px;overflow:hidden" size="small">
+            <el-option v-for='item in PortTypeList'
+              :label='item.Name'
+              :value='item.Id'
+              :key='item.Id'>
+            </el-option>
+          </el-select>
+				</el-form-item>
 				<div class="approval_page_title">{{$t('fnc.lcshezhi')}}</div>
 				<div class="approval_page_content">
 					<div class="approval_person_content">
 						<span class="approval_span_type">{{$t('fnc.mrspliucheng')}}</span>
 						<span style="float:right"><el-button @click="Auditshow=true,EditAudit()" style="padding:4px" type="primary" icon="el-icon-edit" circle></el-button></span>
-						
+
 						<div class="approval_person_list fl">
 							<span class="approval_person_list_tit">{{$t('fnc.mrspiren')}}</span>
 							<div class="padding_l88">
@@ -549,7 +558,7 @@
 						<el-input v-model.number="item.Sort" size="mini" style="width:200px"></el-input>
 					</li>
 				</ul>
-				
+
 			</div>
 			<span slot="footer" class="dialog-footer">
 				<el-button size="mini" @click="dialogVisible = false">取 消</el-button>
@@ -566,6 +575,7 @@ export default {
 	components: { Treeselect },
 	data(){
 		return{
+      PortTypeList: [],
 			PropertyTypeList:[],
 			xingzhenState:false,
 			DepartmentList:[],
@@ -575,6 +585,8 @@ export default {
 			TemplateId:0,
 			radio:1,
 			addMsg:{
+        PortTypeList: [],
+        PortType: '',
 				Id:0,
 				Name:'',
 				DescribeInfo:'',
@@ -775,8 +787,21 @@ export default {
 		this.getRole()
 		this.getEmployeeList();
 		this.getDepartment();
+    this.getPortType()
 	},
 	methods:{
+    getPortType(){
+			this.apipost(
+				"Template_post_GetPortTypeEnumList",
+				{},
+				res => {
+				if (res.data.resultCode == 1) {
+					this.PortTypeList=res.data.data;
+				}
+				},
+				err => {}
+			);
+		},
 		getPropertyType(){
 			this.apipost(
 				"FinancialFlowTemplate_post_GetPropertyTypeList",
@@ -809,7 +834,7 @@ export default {
     },
 		RadioShow(val){
 			if(val==1){
-				
+
 				this.addMsg.ShowEmployeeList=[];
 				this.addMsg.ShowDepartmentList=[];
 			}
@@ -833,8 +858,8 @@ export default {
 				let id=this.myAuditList[i].Sort;
 				sum+=i+1;
 				sortnum+=this.myAuditList[i].Sort;
-				
-					
+
+
 			}
 			if(sum!=sortnum){
 				this.Error("请输入连续的排序！")
@@ -846,7 +871,7 @@ export default {
 				this.Auditshow=false;
 		},
 		EditAudit(){
-			
+
 		},
     handleCheckAllChangeAcc(val) {
       this.accListMsg = val ? [1,2,3,4] : [];
@@ -884,8 +909,9 @@ export default {
 					this.addMsg.ShowEmployeeList = data.ShowEmployeeList;
 					this.addMsg.ShowDepartmentList = data.ShowDepartmentList;
 					this.addMsg.PropertyType= data.PropertyType;
-					
-					
+          this.addMsg.PortTypeList = data.PortType!=''?data.PortType.split(','):[];
+					this.addMsg.PortType= data.PortType;
+
 					if (data.list && data.list[0] !== -1) {
             this.accListMsg = data.list;
           }
@@ -972,6 +998,11 @@ export default {
 			}
 		},
 		saveApproval(){  // 保存数据
+      if(this.addMsg.PortTypeList&&this.addMsg.PortTypeList.length>0){
+        this.addMsg.PortType = this.addMsg.PortTypeList.join(',')
+      }else{
+        this.addMsg.PortType = ''
+      }
 			if(this.xingzhenState){
 				if(!this.addMsg.PropertyType || this.addMsg.PropertyType=='' ){
 					this.Error("请选择审批类型！");
@@ -1047,7 +1078,7 @@ export default {
 					this.$message.success(this.$t('tips.czchenggong'))
 					if(this.xingzhenState){
 						this.$router.push({ name: 'XProcessmanagement',query:{"type":this.addMsg.TemplateType,'Branch_Id':this.$route.query.Branch_Id} })
-						
+
 					}else{
 						this.$router.push({ name: 'FProcessManagement',query:{"type":this.addMsg.TemplateType,'Branch_Id':this.$route.query.Branch_Id} })
 
@@ -1058,6 +1089,8 @@ export default {
 						this.addMsg.TemplateSorce=2;
 					}
 					this.addMsg = {
+            PortTypeList: this.addMsg.PortTypeList,
+            PortType: this.addMsg.PortType,
 						PropertyType:'',
 						Id:this.addMsg.Id,
 						Name:this.addMsg.Name,
@@ -1582,7 +1615,7 @@ export default {
 				AuditList.AuditDescription = this.AuditDescription;
 				AuditList.SpecialNode = this.GetNodeValue;
 				this.myAuditList.push(AuditList);
-			}		
+			}
 			if(type==10){//分公司op
 				// if(!this.WindowID){
 				// 	this.$message.error("请选择窗口！")
@@ -1595,7 +1628,7 @@ export default {
 				AuditList.AuditDescription = this.AuditDescription;
 				AuditList.SpecialNode = this.GetNodeValue;
 				this.myAuditList.push(AuditList);
-			}	
+			}
 			if(type==11){//总部线控
 				AuditList.AuditType = 11;
 				AuditList.RoleOrInitiator = '';
@@ -1604,7 +1637,7 @@ export default {
 				AuditList.AuditDescription = this.AuditDescription;
 				AuditList.SpecialNode = this.GetNodeValue;
 				this.myAuditList.push(AuditList);
-			}	
+			}
 				if(type==8){//记账出纳
 				// if(!this.WindowID){
 				// 	this.$message.error("请选择窗口！")
@@ -1617,7 +1650,7 @@ export default {
 				AuditList.AuditDescription = this.AuditDescription;
 				AuditList.SpecialNode = this.GetNodeValue;
 				this.myAuditList.push(AuditList);
-			}		
+			}
 				if(type==9){//收款出纳
 				// if(!this.WindowID){
 				// 	this.$message.error("请选择窗口！")

src/components/dmc/manager/teamRevenueExpenditure.vue

@@ -41,6 +41,7 @@
       <span class="fr" style="margin-top: -8px;">
         <input type="button" class="normalBtn" value="新增付款" @click="goUrl(1,2)" /><input type="button" class="normalBtn"
           value="新增收款" @click="goUrl(1,1)" />
+        <input type="button" class="normalBtn" value="预付款冲抵" @click="isOffset(1,2)" />
       </span>
     </p>
     <table border="0" cellspacing="1" cellpadding="0" class="teamRevenueExpenditureTable">
@@ -100,6 +101,7 @@
       <span class="fr" style="margin-top: -8px;">
         <input type="button" class="normalBtn" value="新增付款" @click="goUrl(2,2)" /><input type="button" class="normalBtn"
           value="新增收款" @click="goUrl(2,1)" />
+        <input type="button" class="normalBtn" value="预付款冲抵" @click="isOffset(2,2)" />
       </span>
     </p>
     <table border="0" cellspacing="1" cellpadding="0" class="teamRevenueExpenditureTable">
@@ -159,6 +161,7 @@
       <span class="fr" style="margin-top: -8px;">
         <input type="button" class="normalBtn" value="新增付款" @click="goUrl(3,2)" /><input type="button" class="normalBtn"
           value="新增收款" @click="goUrl(3,1)" />
+        <input type="button" class="normalBtn" value="预付款冲抵" @click="isOffset(3,2)" />
       </span>
     </p>
     <table border="0" cellspacing="1" cellpadding="0" class="teamRevenueExpenditureTable">
@@ -218,6 +221,7 @@
       <span class="fr" style="margin-top: -8px;">
         <input type="button" class="normalBtn" value="新增付款" @click="goUrl(5,2)" /><input type="button" class="normalBtn"
           value="新增收款" @click="goUrl(5,1)" />
+        <input type="button" class="normalBtn" value="预付款冲抵" @click="isOffset(5,2)" />
       </span>
     </p>
     <table border="0" cellspacing="1" cellpadding="0" class="teamRevenueExpenditureTable">
@@ -278,6 +282,7 @@
       <span class="fr" style="margin-top: -8px;">
         <input type="button" class="normalBtn" value="新增付款" @click="goUrl(14,2)" /><input type="button"
           class="normalBtn" value="新增收款" @click="goUrl(14,1)" />
+        <input type="button" class="normalBtn" value="预付款冲抵" @click="isOffset(14,2)" />
       </span>
     </p>
     <table border="0" cellspacing="1" cellpadding="0" class="teamRevenueExpenditureTable">
@@ -339,13 +344,25 @@
         </el-carousel-item>
       </el-carousel>
     </div>
+    <offset :isShow="cdState" :obj="queryObj" @close="cdState=false"></offset>
   </div>
 </template>
 
 <script>
+  import offset from '../../public/offset.vue';
   export default {
+    components: { offset },
     data() {
       return {
+        Handmsg: {
+          OtherType: 7,
+          ReFinanceId: 0,
+          Rate: 0,
+          TCNUM: '',
+          czState: true,
+        },
+        queryObj:null,
+        cdState: false,
         LineId:0,
         picIsShow: false,
         picObj: [],
@@ -363,6 +380,53 @@
       }
     },
     methods: {
+      isOffset(_orderSource, _type){
+        this.goUrl(_orderSource, _type,'Offset')
+      },
+      // 制作单据
+      makeAdocument(row, index, num, name,Offset) {
+        if((num==2||num==3)&&row.Income<=0){
+          this.Info('请先制收款单据，再制成本或退款单据！')
+          return
+        }
+        if(Offset){
+          this.cdState = true
+        }
+        let type = 0
+        if(num==3){
+          type = 2
+        }else{
+          type = num
+        }
+        this.BillMakingMsg.ReFinanceId = row.OrderId;
+        this.BillMakingMsg.ReFinanceId2 = num;
+        if (name == "Hand") {
+          this.BillMakingMsg.OtherType = 62;
+        } else {
+          this.BillMakingMsg.OtherType = 61;
+        }
+        let text = "";
+        let query = {};
+        if (num == 1) {
+          text = "收款";
+        } else if (num == 2) {
+          text = "付款";
+        }
+        query = {
+            blank: "y",
+            tab: `新增${text}单据`,
+            Type: type,
+            tradeObj: JSON.stringify(this.BillMakingMsg),
+        };
+        this.queryObj = query
+        if(!Offset){
+          this.$store.commit("ChoiceAddFinancialDocuments");
+          this.$router.push({
+            path: "/ChoiceAddFinancialDocuments",
+            query
+          });
+        }
+      },
       //跳转到财务页面
       goFinaceURL(id) {
         this.$router.push({
@@ -438,7 +502,7 @@
         })
         this.picIsShow = true;
       },
-      goUrl(_orderSource, _type) {
+      goUrl(_orderSource, _type,Offset) {
         let TCIDARR = []
         let id = [];
         if(this.msgList&&this.msgList.length>0&&this.msgList[0].LineId==this.LineId){
@@ -480,6 +544,25 @@
           TCIDList: TCIDARR
         }
         id = id.length > 0 ? JSON.stringify(id) : null;
+
+        // 冲抵
+        if(Offset){
+          orderObj.TCIDList = [this.$route.query.id]
+          let query = {
+            'czmsg': this.Handmsg,
+            'Type': _type,
+            'path': 'teamRevenueExpenditure',
+            'companyID': this.msgList&&this.msgList.length>0&&this.msgList[0].OutBranchId!=null?this.msgList[0].OutBranchId:this.$route.query.OutBranchId,
+            'blank': 'y',
+            'orderObj': JSON.stringify(orderObj),
+            'OrderSource': _orderSource,
+            'searchTitle': '分摊'
+          };
+          this.queryObj = query
+          this.cdState = true
+          return
+        }
+
         this.$router.push({
           name: 'ChoiceAddFinancialDocuments',
           query: {