优化

src/api/oa/ht/contractCard.js

@@ -0,0 +1,39 @@
+import axios from '@/utils/request'
+
+import config from '@/common/config'
+
+let base = config.getOaBasePath();
+
+
+/**
+ * ht_contract_card
+ *1    默认只开放普通查询，所有查询，只要上传	 分页参数 {currentPage:当前页码从1开始,pageSize:每页记录数,total:总记录【数如果是0后台会自动计算总记录数非0不会自动计算】}，后台都会自动按分页查询 其它 api用到再打开，没用到的api请注释掉，
+ *2 查询、新增、修改的参数格式  params={htId:'合同id 主键',draftId:'合同起草id',cpId:'合同关联相对方id',cpName:'相对方名称',linkName:'相对方联系人名称',linkPhone:'相对方联系人电话',cpAddress:'相对方联系人地址',cpOpenBank:'相对方开户行',cpBankAccount:'相对方开户行账号',htName:'合同名称',htSn:'合同编号',htGrossAmount:'合同总金额',htKaiPiaoAmount:'合同开票金额',htReceivedAmount:'合同已收金额',htReceivableAmount:'合同应收金额',htPayedAmount:'合同已付金额',htPayableAmount:'合同应付金额',htFile:'合同档案',htEffectDate:'合同生效日期',htFzUserid:'合同负责人id',htFzUsername:'合同负责人名称',htParentType:'合同类型主要分类',htType:'合同类型具体小类',htSignDate:'合同签订日期',htExpireDate:'合同到期日期',htStatus:'合同状态',htDemand:'合同需求说明',htParty:'合同签约主体',htPartyName:'合同签约主体名称',htImportantClause:'合同重要条款',branchId:'机构id',createTime:'创建时间',createUserId:'创建用户id',createUserName:'创建用户名称'}
+ **/
+ 
+//普通查询 条件之间and关系  
+export const listContractCard = params => { return axios.get(`${base}/oa/ht/contractCard/list`, { params: params }); };
+
+//模糊查询ht_contract_card 条件之间or关系  
+//export const listContractCardKey = params => { return axios.get(`${base}/oa/ht/contractCard/listKey`, { params: params }); };
+
+//删除一条ht_contract_card params={htId:'合同id 主键'}
+export const delContractCard = params => { return axios.post(`${base}/oa/ht/contractCard/del`,params); };
+
+//批量删除ht_contract_card  params=[{htId:'合同id 主键'}]
+export const batchDelContractCard = params => { return axios.post(`${base}/oa/ht/contractCard/batchDel`, params); };
+
+//修改一条ht_contract_card记录
+export const editContractCard = params => { return axios.post(`${base}/oa/ht/contractCard/edit`, params); };
+
+//新增一条ht_contract_card
+export const addContractCard = params => { return axios.post(`${base}/oa/ht/contractCard/add`, params); };
+
+export const computeAmount = params => { return axios.get(`${base}/oa/ht/contractCard/computeAmount`, { params: params }); };
+
+//获取图表数据
+export const loadChartData = params => { return axios.get(`${base}/oa/ht/contractCard/loadChartData`, { params: params }); };
+
+//获取统计报表数据
+export const getStatisticalStatement = params => { return axios.get(`${base}/oa/ht/contractCard/getStatisticalStatement`, { params: params }); };
+

src/views/xm/core/xmIteration/XmIterationInfo.vue

@@ -67,7 +67,7 @@
 	import xmRecord from '../xmRecord/XmRecordMng';
 	import xmCost from '../xmProject/XmProjectCost';
 	import xmBudget from '../xmProject/XmProjectBudgetCost';
-	import xmContract from '../xmProjectContract/XmProjectContractMng';
+	import xmContract from '../xmContract/XmContractMng';
 	import xmEnvList from '../xmProjectEnvList/XmProjectEnvListMng';
 	import xmPhaseMng from '../xmPhase/XmPhaseMng';
 	import xmMenuMng from '../xmMenu/XmMenuMng';

src/views/xm/core/xmProduct/XmProductInfo.vue

@@ -203,7 +203,7 @@
 	import xmRecord from '../xmRecord/XmRecordMng';
 	import xmCost from '../xmProject/XmProjectCost';
 	import xmBudget from '../xmProject/XmProjectBudgetCost';
-	import xmContract from '../xmProjectContract/XmProjectContractMng';
+	import xmContract from '../xmContract/XmContractMng';
 	import xmEnvList from '../xmProjectEnvList/XmProjectEnvListMng';
 	import xmPhaseForProduct from '../xmPhase/xmPhaseForProduct';
 	import xmMenuMng from '../xmMenu/XmMenuMng';

src/views/xm/core/xmProject/XmProjectInfo.vue

@@ -178,7 +178,7 @@
 	import xmRecord from '../xmRecord/XmRecordMng';
 	import xmCost from './XmProjectCost';
 	import xmBudget from './XmProjectBudgetCost';
-	import xmContract from '../xmProjectContract/XmProjectContractMng';
+	import xmContract from '../xmContract/XmContractMng';
 	import xmEnvList from '../xmProjectEnvList/XmProjectEnvListMng';
 	import xmPhaseMng from '../xmPhase/XmPhaseMng';
 	import xmMenuMng from '../xmMenu/XmMenuMng';

src/views/xm/core/xmProjectContract/XmProjectContractAdd.vue

@@ -1,111 +0,0 @@
-<template>
-	<section class="page-container  padding border">
-		<el-row>
-			<!--新增界面 XmProjectContract xm_project_contract--> 
-			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
-				<el-form-item label="合同编号" prop="htId">
-					<el-input v-model="addForm.htId" placeholder="合同编号" ></el-input>
-				</el-form-item> 
-				<el-form-item label="项目编号" prop="projectId">
-					<el-input v-model="addForm.projectId" placeholder="项目编号" ></el-input>
-				</el-form-item> 
-				<el-form-item>
-					<el-col :span="24" :offset="8"> 
-						<el-button @click.native="handleCancel">取消</el-button>  
-						<el-button v-loading="load.add" type="primary" @click.native="addSubmit" :disabled="load.add==true">提交</el-button>  
-					</el-col>
-				</el-form-item> 
-			</el-form>
-		</el-row>
-	</section>
-</template>
-
-<script>
-	import util from '@/common/js/util';//全局公共库
-	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询 
-	import { addXmProjectContract } from '@/api/xm/core/xmProjectContract';
-	import { mapGetters } from 'vuex'
-	
-	export default { 
-		computed: {
-		    ...mapGetters([
-		      'userInfo','roles'
-		    ])
-		},
-		props:['xmProjectContract','visible'],
-		watch: {
-	      'xmProjectContract':function( xmProjectContract ) {
-	        this.addForm = xmProjectContract;
-	      },
-	      'visible':function(visible) { 
-	      	if(visible==true){
-	      		//从新打开页面时某些数据需要重新加载，可以在这里添加
-	      	}
-	      } 
-	    },
-		data() {
-			return {
-				dicts:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
-				load:{ list: false, edit: false, del: false, add: false },//查询中...
-				addFormRules: {
-					htId: [
-						//{ required: true, message: '合同编号不能为空', trigger: 'blur' }
-					]
-				},
-				//新增界面数据 xm_project_contract
-				addForm: {
-					htId:'',projectId:''
-				}
-				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
-				
-				/**end 在上面加自定义属性**/
-			}//end return
-		},//end data
-		methods: {
-			// 取消按钮点击 父组件监听@cancel="addFormVisible=false" 监听
-			handleCancel:function(){
-				this.$refs['addForm'].resetFields();
-				this.$emit('cancel');
-			},
-			//新增提交XmProjectContract xm_project_contract 父组件监听@submit="afterAddSubmit"
-			addSubmit: function () {
-				
-				this.$refs.addForm.validate((valid) => {
-					if (valid) {
-						
-						this.$confirm('确认提交吗？', '提示', {}).then(() => { 
-							this.load.add=true
-							let params = Object.assign({}, this.addForm); 
-							addXmProjectContract(params).then((res) => {
-								this.load.add=false
-								var tips=res.data.tips;
-								if(tips.isOk){
-									this.$refs['addForm'].resetFields();
-									this.$emit('submit');//  @submit="afterAddSubmit"
-								}
-								this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); 
-							}).catch( err  => this.load.add=false);
-						});
-					}
-				});
-			}
-			/**begin 在下面加自定义方法,记得补上面的一个逗号**/
-				
-			/**end 在上面加自定义方法**/
-			
-		},//end method
-		components: {  
-		    //在下面添加其它组件 'xm-project-contract-edit':XmProjectContractEdit
-		},
-		mounted() {
-			this.addForm=Object.assign(this.addForm, this.xmProjectContract);  
-			/**在下面写其它函数***/
-			
-		}//end mounted
-	}
-
-</script>
-
-<style scoped>
-
-</style>

src/views/xm/core/xmProjectContract/XmProjectContractEdit.vue

@@ -1,106 +0,0 @@
-<template>
-	<section class="page-container  padding border">
-		<el-row> 
-		<!--编辑界面 XmProjectContract xm_project_contract--> 
-			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
-				<el-form-item label="合同编号" prop="htId">
-					<el-input v-model="editForm.htId" placeholder="合同编号"></el-input>
-				</el-form-item> 
-				<el-form-item label="项目编号" prop="projectId">
-					<el-input v-model="editForm.projectId" placeholder="项目编号"></el-input>
-				</el-form-item> 
-				<el-form-item> 
-					<el-col :span="24" :offset="8"> 
-						<el-button @click.native="handleCancel">取消</el-button>  
-						<el-button v-loading="load.edit" type="primary" @click.native="editSubmit" :disabled="load.edit==true">提交</el-button>  
-					</el-col> 
-				</el-form-item> 
-			</el-form>
-		</el-row>
-	</section>
-</template>
-
-<script>
-	import util from '@/common/js/util';//全局公共库
-	//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
-	import { editXmProjectContract } from '@/api/xm/core/xmProjectContract';
-	import { mapGetters } from 'vuex'
-	
-	export default { 
-		computed: {
-		    ...mapGetters([
-		      'userInfo','roles'
-		    ])
-		},
-		props:['xmProjectContract','visible'],
-		watch: {
-	      'xmProjectContract':function( xmProjectContract ) {
-	        this.editForm = xmProjectContract;
-	      },
-	      'visible':function(visible) { 
-	      	if(visible==true){
-	      		//从新打开页面时某些数据需要重新加载，可以在这里添加
-	      	}
-	      } 
-	    },
-		data() {
-			return {
-				dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
-				load:{ list: false, edit: false, del: false, add: false },//查询中...
-				editFormRules: {
-					htId: [
-						//{ required: true, message: '合同编号不能为空', trigger: 'blur' }
-					]
-				},
-				//编辑界面数据  XmProjectContract xm_project_contract
-				editForm: {
-					htId:'',projectId:''
-				}
-				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
-				
-				/**end 在上面加自定义属性**/
-			}//end return
-		},//end data
-		methods: {
-			// 取消按钮点击 父组件监听@cancel="editFormVisible=false" 监听
-			handleCancel:function(){
-				this.$refs['editForm'].resetFields();
-				this.$emit('cancel');
-			},
-			//编辑提交XmProjectContract xm_project_contract父组件监听@submit="afterEditSubmit"
-			editSubmit: function () {
-				this.$refs.editForm.validate((valid) => {
-					if (valid) {
-						this.$confirm('确认提交吗？', '提示', {}).then(() => { 
-							this.load.edit=true
-							let params = Object.assign({}, this.editForm); 
-							editXmProjectContract(params).then((res) => {
-								this.load.edit=false
-								var tips=res.data.tips;
-								if(tips.isOk){
-									this.$refs['editForm'].resetFields();
-									this.$emit('submit');//  @submit="afterEditSubmit"
-								}
-								this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); 
-							}).catch( err =>this.load.edit=false);
-						});
-					}
-				});
-			}
-			/**begin 在下面加自定义方法,记得补上面的一个逗号**/
-				
-			/**end 在上面加自定义方法**/
-		},//end method
-		components: {  
-		    //在下面添加其它组件 'xm-project-contract-edit':XmProjectContractEdit
-		},
-		mounted() {
-			this.editForm=Object.assign(this.editForm, this.xmProjectContract);  
-		}
-	}
-
-</script>
-
-<style scoped>
-
-</style>