db0388f4 by xiaomiao

Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

2 parents e7cb0684 19b87257
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-15 09:43:21 4 * @LastEditTime: 2023-09-04 17:09:21
5 --> 5 -->
6 <template> 6 <template>
7 <div class="clxx"> 7 <div class="clxx">
...@@ -134,7 +134,6 @@ ...@@ -134,7 +134,6 @@
134 this.previewImg.bsmSj = this.tableData[this.treeCheckIndex].bsmSj; 134 this.previewImg.bsmSj = this.tableData[this.treeCheckIndex].bsmSj;
135 } 135 }
136 }, 136 },
137 // 材料目录明细初始化
138 /** 137 /**
139 * @description: 材料目录明细初始化 138 * @description: 材料目录明细初始化
140 * @param {*} type 139 * @param {*} type
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
16 16
17 <el-tabs v-model="activeName" @tab-click="handleClick" class="from-clues-header"> 17 <el-tabs v-model="activeName" @tab-click="handleClick" class="from-clues-header">
18 <el-tab-pane label="基本信息" name="1"></el-tab-pane> 18 <el-tab-pane label="基本信息" name="1"></el-tab-pane>
19 <el-tab-pane label="银行信息" name="2"></el-tab-pane> 19 <el-tab-pane label="银行机构" name="2"></el-tab-pane>
20 <el-tab-pane label="企业信息" name="3"></el-tab-pane> 20 <el-tab-pane label="企业信息" name="3"></el-tab-pane>
21 </el-tabs> 21 </el-tabs>
22 22
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-31 09:36:04 4 * @LastEditTime: 2023-09-04 17:12:05
5 --> 5 -->
6 <template> 6 <template>
7 <div class="szxx"> 7 <div class="szxx">
...@@ -114,15 +114,18 @@ ...@@ -114,15 +114,18 @@
114 * @author: renchao 114 * @author: renchao
115 */ 115 */
116 list () { 116 list () {
117 return new Promise((resolve, reject) => {
117 var bsmSlsq = this.$route.query.bsmSlsq; 118 var bsmSlsq = this.$route.query.bsmSlsq;
118 getSlsqBdcqzList({ bsmSlsq: bsmSlsq }).then((res) => { 119 getSlsqBdcqzList({ bsmSlsq: bsmSlsq }).then((res) => {
120 resolve(res.code);
119 if (res.code === 200) { 121 if (res.code === 200) {
120 this.tableData = res.result; 122 this.tableData = res.result;
121 if (res.result) { 123 if (res.result) {
122 this.bdcqz = res.result[0]; 124 this.bdcqz = res.result[0];
123 } 125 }
124 } 126 }
125 }); 127 })
128 })
126 }, 129 },
127 /** 130 /**
128 * @description: 打开证书预览弹窗 131 * @description: 打开证书预览弹窗
...@@ -166,13 +169,14 @@ ...@@ -166,13 +169,14 @@
166 * @author: renchao 169 * @author: renchao
167 */ 170 */
168 confirmInvalid () { 171 confirmInvalid () {
169 invalidCertificate({ bsmBdcqz: this.bsmBdcqz, zfyy: this.zfyy }).then((res) => { 172 invalidCertificate({ bsmBdcqz: this.bsmBdcqz, zfyy: this.zfyy }).then(async (res) => {
170 if (res.code === 200) { 173 if (res.code === 200) {
171 this.list(); 174 this.list();
172 this.$message.success("作废成功"); 175 this.$message.success("作废成功");
173 this.invalidDiglog = false; 176 this.invalidDiglog = false;
174 this.zfyy = '' 177 this.zfyy = ''
175 this.openZsylDialog(this.bdcqz); 178 let res = await this.list()
179 if (res && res == 200) this.openZsylDialog(this.bdcqz);
176 } else { 180 } else {
177 this.$message.error(res.message); 181 this.$message.error(res.message);
178 } 182 }
......
1 /*
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-09-01 10:17:27
5 */
6 import filter from '@/utils/filter.js'
7 let vm = null
8
9 const sendThis = (_this) => {
10 vm = _this
11 }
12 class data extends filter {
13 constructor() {
14 super()
15 }
16 columns () {
17 return [
18 {
19 label: '序号',
20 type: 'index',
21 width: '50',
22 render: (h, scope) => {
23 return (
24 <div>
25 {(vm.pageData.currentPage - 1) * vm.pageData.pageSize + scope.$index + 1}
26 </div>
27 )
28 }
29 },
30 {
31 prop: "sqrmc",
32 label: "姓名/名称",
33 },
34 {
35 prop: "zjzl",
36 label: "证件种类",
37 render: (h, scope) => {
38 return (
39 <el-select
40 class="width100"
41 clearable
42 value={scope.row[scope.column.property]}
43 onChange={(val) => {
44 scope.row[scope.column.property] = val;
45 }}
46 >
47 {vm.dictData["A30"].map((option) => {
48 return (
49 <el-option
50 label={option.dname}
51 value={option.dcode}
52 ></el-option>
53 );
54 })}
55 </el-select>
56 );
57 },
58 },
59 {
60 prop: "zjh",
61 label: "证件号",
62 },
63 {
64 prop: "frmc",
65 label: "法人名称",
66 },
67 {
68 prop: "txdz",
69 label: "地址",
70 },
71 {
72 prop: "dh",
73 label: "联系电话",
74 },
75 {
76 label: '操作',
77 width: '80',
78 align: 'center',
79 render: (h, scope) => {
80 return (
81 <div>
82 <el-button type="text" onClick={() => { this.handleDelete(scope.row) }}>删除</el-button>
83 </div>
84 )
85 }
86 }
87 ]
88 }
89 }
90 let datas = new data()
91 export {
92 datas,
93 sendThis
94 }
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-25 08:59:04 4 * @LastEditTime: 2023-09-04 16:59:15
5 --> 5 -->
6 <template> 6 <template>
7 <div class='yhjgba'> 7 <div class="from-clues">
8 <el-empty description="正在开发"></el-empty> 8 <!-- 表单部分 -->
9 <div class="from-clues-header">
10 <el-form :model="queryForm" ref="queryForm" @submit.native.prevent label-width="80px">
11 <el-row>
12 <el-col :span="5">
13 <el-form-item label="姓名/名称">
14 <el-input placeholder="姓名/名称" v-model="queryForm.sqrmc" clearable class="width100">
15 </el-input>
16 </el-form-item>
17 </el-col>
18 <el-col :span="5">
19 <el-form-item label="证件号">
20 <el-input placeholder="证件号" v-model="queryForm.zjh" clearable class="width100">
21 </el-input>
22 </el-form-item>
23 </el-col>
24 <el-col :span="14" class="btnColRight">
25 <el-form-item>
26 <el-button type="primary" native-type="submit" @click="handleSearch">查询</el-button>
27 </el-form-item>
28 </el-col>
29 </el-row>
30 </el-form>
31 </div>
32 <div class="from-clues-content">
33 <lb-table :page-size="pageData.size" border :current-page.sync="pageData.currentPage" :heightNum="280"
34 :total="tableData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange"
35 :column="tableData.columns" :data="tableData.data">
36 </lb-table>
37 </div>
9 </div> 38 </div>
10 </template> 39 </template>
11 <script> 40 <script>
12 41 import table from "@/utils/mixin/table"
42 import { datas, sendThis } from "./data"
13 export default { 43 export default {
44 name: "cwrz",
14 components: {}, 45 components: {},
46 mixins: [table],
47 mounted () {
48 sendThis(this);
49 },
50 computed: {
51 },
15 data () { 52 data () {
16 return { 53 return {
17 } 54 queryForm: {
55 sqrmc: "",
56 zjh: "",
57 },
58 pageData: {
59 current: 1,
60 size: 10,
61 },
62 tableData: {
63 total: 0,
64 columns: datas.columns(),
65 data: [],
66 },
67 };
68 },
69 methods: {
70 /**
71 * @description: queryClick
72 * @author: renchao
73 */
74 queryClick () {
75 },
76 handleSearch () { },
77 handleDelete () { }
18 } 78 }
19 } 79 }
20 </script> 80 </script>
21 <style scoped lang='scss'> 81 <style scoped lang="scss">
82 @import "~@/styles/public.scss";
22 </style> 83 </style>
84
......
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
67 import { datas, sendThis } from "../javascript/selecBdcql.js"; 67 import { datas, sendThis } from "../javascript/selecBdcql.js";
68 import { defaultParameters } from "../javascript/publicDefaultPar.js"; 68 import { defaultParameters } from "../javascript/publicDefaultPar.js";
69 import { selectQlxx } from "@/api/ywsq.js"; 69 import { selectQlxx } from "@/api/ywsq.js";
70 import { startBusinessFlow } from "@/api/workFlow.js"; 70 import { startBusinessFlow,startTogetherFlow } from "@/api/workFlow.js";
71 import { getQllxByBsmSqyw } from "@/api/sysSqdjyw.js"; 71 import { getQllxByBsmSqyw } from "@/api/sysSqdjyw.js";
72 export default { 72 export default {
73 mixins: [table, jump], 73 mixins: [table, jump],
...@@ -126,7 +126,8 @@ ...@@ -126,7 +126,8 @@
126 this.$alert("请至少选择一条数据"); 126 this.$alert("请至少选择一条数据");
127 return; 127 return;
128 } 128 }
129 this.loading = true 129 this.loading = true;
130 if(this.sqywInfo.sqfl=='1'){
130 startBusinessFlow({ 131 startBusinessFlow({
131 bsmSqyw: this.sqywInfo.bsmSqyw, 132 bsmSqyw: this.sqywInfo.bsmSqyw,
132 bdcdysz: this.bdcdysz, 133 bdcdysz: this.bdcdysz,
...@@ -154,6 +155,36 @@ ...@@ -154,6 +155,36 @@
154 }).catch(() => { 155 }).catch(() => {
155 this.loading = false 156 this.loading = false
156 }) 157 })
158 }else{
159 startTogetherFlow({
160 bsmSqyw: this.sqywInfo.bsmSqyw,
161 bdcdysz: this.bdcdysz,
162 }).then((res) => {
163 this.loading = false
164 if (res.code == 200) {
165 this.$message({
166 showClose: true,
167 message: '发起申请成功',
168 type: 'success'
169 })
170 if (!this.isJump) {
171 this.jump(res.result, this.sqywInfo.djywbm)
172 } else {
173 store.dispatch('user/refreshPage', true);
174 this.$popupCacel()
175 }
176 } else {
177 if (res.result && res.result.length > 0) {
178 ywPopupDialog("申请错误明细", "components/ywdialog", { result: res.result }, '36%', true)
179 } else {
180 ywPopupDialog("申请错误明细", "components/ywdialog", { message: res.message }, '36%', true)
181 }
182 }
183 }).catch(() => {
184 this.loading = false
185 })
186 }
187
157 }, 188 },
158 /** 189 /**
159 * @description: handleSelectionChange 190 * @description: handleSelectionChange
......
...@@ -92,10 +92,10 @@ export function queueDjywmc (djywbm, djqxbm) { ...@@ -92,10 +92,10 @@ export function queueDjywmc (djywbm, djqxbm) {
92 case "C40100": //一并申请首次 92 case "C40100": //一并申请首次
93 vm = "selectYbsc"; 93 vm = "selectYbsc";
94 break; 94 break;
95 case "C40300": //一并申请变更 95 // case "C40300": //一并申请变更
96 case "C40400": //一并申请注销 96 // case "C40400": //一并申请注销
97 vm = "selectYbbg"; 97 // vm = "selectYbbg";
98 break; 98 // break;
99 case "C04372": //一并国有房屋变更 99 case "C04372": //一并国有房屋变更
100 case "C04371": //一并国有房屋转移 100 case "C04371": //一并国有房屋转移
101 vm = "selectYbgybg"; 101 vm = "selectYbgybg";
......