diff --git a/src/page/Business/Infswf/views/min.vue b/src/page/Business/Infswf/views/min.vue index e2d6c8b..cfb1ec8 100644 --- a/src/page/Business/Infswf/views/min.vue +++ b/src/page/Business/Infswf/views/min.vue @@ -4,9 +4,11 @@ <el-collapse-item title="清算来报" name="ovwp"> <m-ovwp :model="model" :codes="codes" /> </el-collapse-item> + <!-- <el-collapse-item title="云平台/E结算来报" name="recode"> <m-recode :model="model" :codes="codes" /> </el-collapse-item> + --> </c-collapse> </div> diff --git a/src/page/Statics/Act/ActInfo.vue b/src/page/Statics/Act/ActInfo.vue index 5e9897f..ff5d02c 100644 --- a/src/page/Statics/Act/ActInfo.vue +++ b/src/page/Statics/Act/ActInfo.vue @@ -36,7 +36,7 @@ <c-fullbox> <c-input :disabled="operate === 'edit'" v-model="act.extkey" placeholder="请输入账号"> </c-input> - <!--template slot="footer" v-if="operate === 'add'"> + <template slot="footer" v-if="operate === 'add'"> <c-button style="margin: 0 0 0 10px; padding: 0 12px" size="small" @@ -45,8 +45,9 @@ > 获取 </c-button> - </template--> + </template> + <!-- <template slot="footer" > <c-button style="margin: 0 0 0 10px; padding: 0 12px" @@ -56,7 +57,7 @@ > 获取 </c-button> - </template> + </template>--> </c-fullbox> </el-form-item> @@ -69,7 +70,7 @@ <c-col :span="24" v-if="operate != 'details'"> <el-form-item label="核心业务代号" prop="acccore" v-if="operate !== 'details'"> - <c-input v-model="act.acccore" placeholder="请输入核心业务代号" :disabled=true> </c-input> + <c-input v-model="act.acccore" placeholder="请输入核心业务代号" :disabled=false> </c-input> </el-form-item> </c-col> <c-col :span="24"> @@ -126,7 +127,9 @@ </c-col> <c-col :span="24"> <el-form-item label="币种" prop="cur" > - <c-select v-model="act.cur" ref="cur" @change="curChange" placeholder="请输入币种" dbCode="CURTXT" :isCache="false" :isShowKeyAndLabel="true" filterable :disabled="!(act.extkey.startsWith('FT') || act.extkey.startsWith('EF'))"> </c-select> + <!-- <c-select v-model="act.cur" ref="cur" @change="curChange" placeholder="请输入币种" dbCode="CURTXT" :isCache="false" :isShowKeyAndLabel="true" filterable :disabled="!(act.extkey.startsWith('FT') || act.extkey.startsWith('EF'))"> </c-select> --> + <c-select v-model="act.cur" ref="cur" @change="curChange" placeholder="请输入币种" dbCode="CURTXT" :isCache="false" :isShowKeyAndLabel="true" filterable + :disabled=false> </c-select> </el-form-item> </c-col> <c-col :span="24"> diff --git a/src/page/Statics/Act/ActList.vue b/src/page/Statics/Act/ActList.vue index 82d56cb..6663af3 100644 --- a/src/page/Statics/Act/ActList.vue +++ b/src/page/Statics/Act/ActList.vue @@ -48,6 +48,8 @@ > <span>详情</span> </button> + + <!-- <c-button style="margin-left: 5px" size="small" @@ -66,6 +68,27 @@ > 删除 </c-button> + // 先放开修改删除按钮-2024-10-06 + --> + + <c-button + style="margin-left: 5px" + size="small" + type="primary" + :disabled="!(type === 'edit')" + @click="actEdit(scope.$index, scope.row)" + > + 修改 + </c-button> + <c-button + style="margin-left: 5px" + size="small" + type="primary" + :disabled="!(type === 'edit')" + @click="actDelete(scope.$index, scope.row)" + > + 删除 + </c-button> </template> </c-table-column> </c-paging-table> @@ -555,10 +578,10 @@ export default { flag = false; } } - if(flag) { - this.$notify.error("请保持Term Typ与核心业务代号一致") - return true; - } + // if(flag) { + // this.$notify.error("请保持Term Typ与核心业务代号一致") + // return true; + // } } return false; }, diff --git a/src/page/Statics/Act/Actjs/Act.js b/src/page/Statics/Act/Actjs/Act.js index 1294544..1028550 100644 --- a/src/page/Statics/Act/Actjs/Act.js +++ b/src/page/Statics/Act/Actjs/Act.js @@ -1,85 +1,85 @@ export default class Act { - constructor() { - this.data = { - typ: "", - cur: "", - extkey: "", - ptyextkey: "", - ptynam: "", - holacc: "", - acccore: "", - trmtyp: "", - acctyp: "", - actpro: "", - dirflg: "", - typnam: "", - curnam: "", - nam: "", - zmqacc: "", - trmnam: "", - trmtypShow: "", - trmnamShow: "", - actnam: "", - pri: "", - delflg: "", - ptyinr: "", - cvrflg: "", + constructor() { + this.data = { + typ: "", + cur: "", + extkey: "", + ptyextkey: "", + ptynam: "", + holacc: "", + acccore: "", + trmtyp: "", + acctyp: "", + actpro: "", + dirflg: "", + typnam: "", + curnam: "", + nam: "", + zmqacc: "", + trmnam: "", + trmtypShow: "", + trmnamShow: "", + actnam: "", + pri: "", + delflg: "", + ptyinr: "", + cvrflg: "", - startnum:"", - selectnum:"" - } + startnum: "", + selectnum: "" } + } } export const Pattern = { - "ptyextkey": [ - { "required": true, "message": "必输项", "type": "string", "trigger": "blur" }, - { "max": 24, "message": "最大长度24个字符", "trigger": "blur" } - ], - "nam": [ - { "required": true, "message": "必输项", "type": "string", "trigger": "blur" }, - { "max": 40, "message": "最大长度40个字符", "trigger": "blur" } - ], - "extkey": [ - { "required": true, "message": "必输项", "type": "string", "trigger": "blur" }, - { "max": 34, "message": "最大长度34个字符", "trigger": "blur" } - ], - "ptynam": [ - { "required": false, "message": "必输项", "type": "string", "trigger": "blur" }, - { "max": 60, "message": "最大长度60个字符", "trigger": "blur" } - ], - "typ": [ - { "required": true, "message": "必输项", "type": "string", "trigger": "blur" }, - { "max": 3, "message": "最大长度3个字符", "trigger": "blur" } - ], - "cur": [ - { "required": true, "message": "必输项", "type": "string", "trigger": "blur" }, - { "max": 3, "message": "最大长度3个字符", "trigger": "blur" } - ], - "acccore": [ - { "required": true, "message": "需获取到核心业务代号", "type": "string", "trigger": "blur" }, - { "max": 4, "message": "最大长度4个字符", "trigger": "blur" } - ], - "trmtyp": [ - { "required": true, "message": "必输项", "type": "string", "trigger": "blur" }, - { "max": 6, "message": "最大长度6个字符", "trigger": "blur" } - ], - "acctyp": [ - { "required": true, "message": "必输项", "type": "string", "trigger": "blur" }, - { "max": 1, "message": "最大长度1个字符", "trigger": "blur" } - ], - "actpro": [ - // { "required": true, "message": "必输项", "type": "string", "trigger": "blur" }, - { "max": 4, "message": "最大长度4个字符", "trigger": "blur" } - ], - "dirflg": [ - // { "required": true, "message": "必输项", "type": "string", "trigger": "blur" }, - { "max": 1, "message": "最大长度1个字符", "trigger": "blur" } - ], - "inftxt": [ - { "required": true, "message": "必输项", "type": "string", "trigger": "blur" }, - { "max": 60, "message": "最大长度60个字符", "trigger": "blur" } - ], - "holacc": [ - { "max": 34, "message": "最大长度34个字符", "trigger": "blur" } - ], + "ptyextkey": [ + { "required": true, "message": "必输项", "type": "string", "trigger": "blur" }, + { "max": 24, "message": "最大长度24个字符", "trigger": "blur" } + ], + "nam": [ + { "required": true, "message": "必输项", "type": "string", "trigger": "blur" }, + { "max": 40, "message": "最大长度40个字符", "trigger": "blur" } + ], + "extkey": [ + { "required": true, "message": "必输项", "type": "string", "trigger": "blur" }, + { "max": 34, "message": "最大长度34个字符", "trigger": "blur" } + ], + "ptynam": [ + { "required": false, "message": "必输项", "type": "string", "trigger": "blur" }, + { "max": 60, "message": "最大长度60个字符", "trigger": "blur" } + ], + "typ": [ + { "required": true, "message": "必输项", "type": "string", "trigger": "blur" }, + { "max": 3, "message": "最大长度3个字符", "trigger": "blur" } + ], + "cur": [ + { "required": true, "message": "必输项", "type": "string", "trigger": "blur" }, + { "max": 3, "message": "最大长度3个字符", "trigger": "blur" } + ], + "acccore": [ + // { "required": true, "message": "需获取到核心业务代号", "type": "string", "trigger": "blur" }, + { "max": 4, "message": "最大长度4个字符", "trigger": "blur" } + ], + "trmtyp": [ + { "required": true, "message": "必输项", "type": "string", "trigger": "blur" }, + { "max": 6, "message": "最大长度6个字符", "trigger": "blur" } + ], + "acctyp": [ + { "required": true, "message": "必输项", "type": "string", "trigger": "blur" }, + { "max": 1, "message": "最大长度1个字符", "trigger": "blur" } + ], + "actpro": [ + // { "required": true, "message": "必输项", "type": "string", "trigger": "blur" }, + { "max": 4, "message": "最大长度4个字符", "trigger": "blur" } + ], + "dirflg": [ + // { "required": true, "message": "必输项", "type": "string", "trigger": "blur" }, + { "max": 1, "message": "最大长度1个字符", "trigger": "blur" } + ], + "inftxt": [ + { "required": true, "message": "必输项", "type": "string", "trigger": "blur" }, + { "max": 60, "message": "最大长度60个字符", "trigger": "blur" } + ], + "holacc": [ + { "max": 34, "message": "最大长度34个字符", "trigger": "blur" } + ], } \ No newline at end of file diff --git a/src/page/Statics/Pty-N/Dbapty-N/index.vue b/src/page/Statics/Pty-N/Dbapty-N/index.vue index 9c70f9b..aba3d0e 100644 --- a/src/page/Statics/Pty-N/Dbapty-N/index.vue +++ b/src/page/Statics/Pty-N/Dbapty-N/index.vue @@ -164,13 +164,14 @@ export default { return 0 } - if (zhFlg!="Y" && !(this.model.ptytyp=="C" && this.model.idtype=="2" && this.model.akkcom=="10313") ){ - this.$notify.warning({ - title: '提示', - message: '分行无权限维护非财务公司信息!' - }); - return 0 - } + //暂时放开权限控制 + // if (zhFlg!="Y" && !(this.model.ptytyp=="C" && this.model.idtype=="2" && this.model.akkcom=="10313") ){ + // this.$notify.warning({ + // title: '提示', + // message: '分行无权限维护非财务公司信息!' + // }); + // return 0 + // } console.log("--",this.$refs.pty.bchAuthMod) let bchAuthMod=this.$refs.pty.bchAuthMod diff --git a/src/page/Statics/Pty-N/Dbipty-N/ActInfo.vue b/src/page/Statics/Pty-N/Dbipty-N/ActInfo.vue index e705440..2af4ddd 100644 --- a/src/page/Statics/Pty-N/Dbipty-N/ActInfo.vue +++ b/src/page/Statics/Pty-N/Dbipty-N/ActInfo.vue @@ -109,7 +109,8 @@ </c-col> <c-col :span="24"> <el-form-item label="币种" prop="cur"> - <c-select v-model="act.cur" ref="cur" @change="curChange" placeholder="请输入币种" dbCode="CURTXT" :isCache="false" :isShowKeyAndLabel="true" filterable :disabled="!(act.extkey.startsWith('FT') || act.extkey.startsWith('EF'))"> </c-select> + <!--<c-select v-model="act.cur" ref="cur" @change="curChange" placeholder="请输入币种" dbCode="CURTXT" :isCache="false" :isShowKeyAndLabel="true" filterable :disabled="!(act.extkey.startsWith('FT') || act.extkey.startsWith('EF'))"> </c-select>--> + <c-select v-model="act.cur" ref="cur" @change="curChange" placeholder="请输入币种" dbCode="CURTXT" :isCache="false" :isShowKeyAndLabel="true" filterable :disabled="false"> </c-select> </el-form-item> </c-col> <c-col :span="24"> diff --git a/src/page/Statics/Pty-N/Dbipty-N/ActList.vue b/src/page/Statics/Pty-N/Dbipty-N/ActList.vue index f44f67a..11d1782 100644 --- a/src/page/Statics/Pty-N/Dbipty-N/ActList.vue +++ b/src/page/Statics/Pty-N/Dbipty-N/ActList.vue @@ -180,9 +180,11 @@ export default { if (this.type=="info") { return true }else if (this.type=="edit"){ - if ((this.$route.query.zhFlg=="Y" && this.$route.query.cwFlg=="Y")||(this.$route.query.zhFlg!="Y" && this.$route.query.cwFlg!="Y")||(this.$route.query.zhFlg!="Y" && this.$route.query.cwFlg=="Y" && this.$route.query.zFlg!="Y")){ - return true - } + //先放开权限控制2024-10-06 + // if ((this.$route.query.zhFlg=="Y" && this.$route.query.cwFlg=="Y")||(this.$route.query.zhFlg!="Y" && this.$route.query.cwFlg!="Y")||(this.$route.query.zhFlg!="Y" && this.$route.query.cwFlg=="Y" && this.$route.query.zFlg!="Y")){ + // return true + // } + return false }else if (this.type=="add"){ return false } @@ -249,7 +251,11 @@ export default { this.actConditon.ptyinr = this.$route.query.inr queryActList(this.actConditon).then((res) => { if (res.respCode == SUCCESS) { - this.$set(this, "actList", res.data) + console.log("==========") + console.log(this) + console.log("==========") + console.log(res.data) + this.$set(this, "actList", res.data.resultList) this.actList.forEach((item, index) => { item.ptyextkey = this.model.extkey item.ptynam = this.model.nam diff --git a/src/page/Statics/Pty-N/Dbipty-N/OitInfo.vue b/src/page/Statics/Pty-N/Dbipty-N/OitInfo.vue index 9aadcfa..56dc313 100644 --- a/src/page/Statics/Pty-N/Dbipty-N/OitInfo.vue +++ b/src/page/Statics/Pty-N/Dbipty-N/OitInfo.vue @@ -165,10 +165,12 @@ export default { if (this.type=="info") { return true }else if (this.type=="edit"){ - if (this.$route.query.maaFlg != "Y" && this.$route.query.zFlg != "Y"){ - console.log("$route----",this.$route) - return true - } + // if (this.$route.query.maaFlg != "Y" && this.$route.query.zFlg != "Y"){ + // console.log("$route----",this.$route) + // return true + // } + //暂时屏蔽权限控制 + return false }else if (this.type=="add"){ return false } @@ -177,9 +179,11 @@ export default { if (this.type=="info") { return true }else if (this.type=="edit"){ - if ((this.$route.query.zhFlg=="Y" && this.$route.query.cwFlg=="Y")||(this.$route.query.zhFlg!="Y" && this.$route.query.cwFlg!="Y")||(this.$route.query.zhFlg!="Y" && this.$route.query.cwFlg=="Y" && this.$route.query.zFlg!="Y")){ - return true - } + // if ((this.$route.query.zhFlg=="Y" && this.$route.query.cwFlg=="Y")||(this.$route.query.zhFlg!="Y" && this.$route.query.cwFlg!="Y")||(this.$route.query.zhFlg!="Y" && this.$route.query.cwFlg=="Y" && this.$route.query.zFlg!="Y")){ + // return true + // } + //暂时屏蔽权限控制 + return false }else if (this.type=="add"){ return false } diff --git a/src/page/Statics/Pty-N/Dbipty-N/PtmList.vue b/src/page/Statics/Pty-N/Dbipty-N/PtmList.vue index 4abf768..3bfaeb4 100644 --- a/src/page/Statics/Pty-N/Dbipty-N/PtmList.vue +++ b/src/page/Statics/Pty-N/Dbipty-N/PtmList.vue @@ -18,7 +18,8 @@ <!-- 操作按钮 --> <c-col :span="24"> <span style="float: left"> - <el-button type="primary" size="small" :disabled="isPageDisabled || $store.state.UserContext.currentOrg.level != 0" v-if="isShowAddBtn" ref="ptmNInsertBtn" @click="ptmAdd">新增</el-button> + <!--<el-button type="primary" size="small" :disabled="isPageDisabled || $store.state.UserContext.currentOrg.level != 0" v-if="isShowAddBtn" ref="ptmNInsertBtn" @click="ptmAdd">新增</el-button> --> + <el-button type="primary" size="small" :disabled="isPageDisabled" v-if="isShowAddBtn" ref="ptmNInsertBtn" @click="ptmAdd">新增</el-button> </span> <span style="float: right"> <el-button size="small" @click="handleReset">重置</el-button> @@ -32,8 +33,11 @@ <c-table-column fixed="right" prop="op" label="操作" width="240px"> <template slot-scope="{ scope }"> <c-button style="margin-left: 5px" size="small" type="" ref="ptmNDisplayBtn" @click="ptmDisplay(scope.row)">详情</c-button> - <c-button style="margin-left: 5px" size="small" type="primary" :disabled="isPageDisabled || $store.state.UserContext.currentOrg.level != 0" v-if="isShowUpdBtn" ref="ptmNUpdateBtn" @click="ptmEdit(scope.row)">修改</c-button> - <c-button style="margin-left: 5px" size="small" type="primary" :disabled="isPageDisabled || $store.state.UserContext.currentOrg.level != 0" v-if="isShowDelBtn" ref="ptmNDeleteBtn" @click="ptmDelete(scope.row)">删除</c-button> + <!--<c-button style="margin-left: 5px" size="small" type="primary" :disabled="isPageDisabled || $store.state.UserContext.currentOrg.level != 0" v-if="isShowUpdBtn" ref="ptmNUpdateBtn" @click="ptmEdit(scope.row)">修改</c-button> --> + <!--<c-button style="margin-left: 5px" size="small" type="primary" :disabled="isPageDisabled || $store.state.UserContext.currentOrg.level != 0" v-if="isShowDelBtn" ref="ptmNDeleteBtn" @click="ptmDelete(scope.row)">删除</c-button> --> + <c-button style="margin-left: 5px" size="small" type="primary" :disabled="isPageDisabled " v-if="isShowUpdBtn" ref="ptmNUpdateBtn" @click="ptmEdit(scope.row)">修改</c-button> + <c-button style="margin-left: 5px" size="small" type="primary" :disabled="isPageDisabled " v-if="isShowDelBtn" ref="ptmNDeleteBtn" @click="ptmDelete(scope.row)">删除</c-button> + </template> </c-table-column> </c-paging-table> @@ -133,9 +137,11 @@ export default { if (this.type=="info") { return true }else if (this.type=="edit"){ - if (this.$store.state.UserContext.currentOrg.level != 0){ - return true - } + // if (this.$store.state.UserContext.currentOrg.level != 0){ + // return true + // } + //暂时放开权限控制 + return false }else if (this.type=="add"){ return false } diff --git a/src/page/Statics/Pty/Dbapty/index.vue b/src/page/Statics/Pty/Dbapty/index.vue index df1bc49..ec2229d 100644 --- a/src/page/Statics/Pty/Dbapty/index.vue +++ b/src/page/Statics/Pty/Dbapty/index.vue @@ -142,10 +142,10 @@ export default { console.log("commitAdd-----提交按钮,弹出主地址窗口--",this.root) console.log("commitAdd-----提交按钮,弹出主地址窗口2--",this.model) - if (!this.model.getflg){ - this.$notify.warning({title: '提示:',message: "请先点击“获取”按钮获取客户ECIF信息!",dangerouslyUseHTMLString: true }); - return 0; - } + // if (!this.model.getflg){ + // this.$notify.warning({title: '提示:',message: "请先点击“获取”按钮获取客户ECIF信息!",dangerouslyUseHTMLString: true }); + // return 0; + // } this.$refs.modelForm.validate((validated) => { if (validated) { diff --git a/src/page/Statics/Pty/Dbipty/PtyInfo.vue b/src/page/Statics/Pty/Dbipty/PtyInfo.vue index 05ea2fd..931e1d8 100644 --- a/src/page/Statics/Pty/Dbipty/PtyInfo.vue +++ b/src/page/Statics/Pty/Dbipty/PtyInfo.vue @@ -10,7 +10,7 @@ style="margin: 0 0 0 10px; padding: 0 12px" size="small" type="primary" - :disabled="!model.extkey || type == 'info'" + :disabled="type == 'info'" @click="clickHuoqu(model.extkey)" > 获取 @@ -21,17 +21,23 @@ </c-col> <c-col :span="24"> <el-form-item label="客户类型" prop="idtype"> - <c-select v-model="model.idtype" style="width: 100%" :disabled=true placeholder="请选择客户类型" dbCode="IDTYPE" :isShowKeyAndLabel="true" filterable :filterKey="['D','F','1','2']"> </c-select> + <c-select v-model="model.idtype" style="width: 100%" + :disabled="isPageDisabled || opertype == 'edit' " + placeholder="请选择客户类型" dbCode="IDTYPE" :isShowKeyAndLabel="true" filterable :filterKey="['D','F','1','2']"> </c-select> </el-form-item> </c-col> <c-col :span="24"> <el-form-item label="组织机构代码" prop="juscod"> - <c-input v-model="model.juscod" placeholder="请输入组织机构代码" :disabled=true> </c-input> + <c-input v-model="model.juscod" placeholder="请输入组织机构代码" + :disabled="isPageDisabled || opertype == 'edit' " + > </c-input> </el-form-item> </c-col> <c-col :span="24"> <el-form-item label="金融机构类型" prop="akkcom"> - <c-select dbCode="FINORG" :isShowKeyAndLabel="true" filterable clearable v-model="model.akkcom" placeholder="请输入金融机构类型" :disabled=true> </c-select> + <c-select dbCode="FINORG" :isShowKeyAndLabel="true" filterable clearable v-model="model.akkcom" placeholder="请输入金融机构类型" + :disabled="isPageDisabled || opertype == 'edit' " + > </c-select> </el-form-item> </c-col> <c-col :span="24"> @@ -84,22 +90,30 @@ <c-col :span="12" class="col-right"> <c-col :span="24"> <el-form-item label="客户英文名称" prop="nam"> - <c-input v-model="model.nam" placeholder="请于主地址输入英文名称" :disabled=true > </c-input> + <c-input v-model="model.nam" placeholder="请于主地址输入英文名称" + :disabled="isPageDisabled || opertype == 'edit' " + > </c-input> </el-form-item> </c-col> <c-col :span="24"> <el-form-item label="客户中文名称" prop="nam1"> - <c-input v-model="model.nam1" placeholder="请输入客户中文名称" :disabled=true> </c-input> + <c-input v-model="model.nam1" placeholder="请输入客户中文名称" + :disabled="isPageDisabled || opertype == 'edit' " + > </c-input> </el-form-item> </c-col> <c-col :span="24"> <el-form-item label="统一社会信用代码" prop="idcode"> - <c-input v-model="model.idcode" placeholder="请输入统一社会信用代码" :disabled=true> </c-input> + <c-input v-model="model.idcode" placeholder="请输入统一社会信用代码" + :disabled="isPageDisabled || opertype == 'edit' " + > </c-input> </el-form-item> </c-col> <c-col :span="24"> <el-form-item label="企业规模(国标)" prop="qygmgb"> - <c-select v-model="model.qygmgb" style="width: 100%" placeholder="请选择企业规模(国标)" dbCode="SIZTXT" :disabled=true :isShowKeyAndLabel="true" filterable> </c-select> + <c-select v-model="model.qygmgb" style="width: 100%" placeholder="请选择企业规模(国标)" dbCode="SIZTXT" + :disabled="isPageDisabled || opertype == 'edit' " + :isShowKeyAndLabel="true" filterable> </c-select> </el-form-item> </c-col> <c-col :span="24">