Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
1660ee0f by renchao@pashanhoo.com
Options

Merge branch 'dev'

2 parents 5c780381 ed5dfa74
Inline Side-by-side
Showing 18 changed files with 493 additions and 311 deletions
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-28 15:49:38 4 * @LastEditTime: 2023-07-28 15:49:38
5 */ 5 */
...@@ -12,6 +12,7 @@ const getters = { ...@@ -12,6 +12,7 @@ const getters = {
12 token: state => state.user.token, 12 token: state => state.user.token,
13 avatar: state => state.user.avatar, 13 avatar: state => state.user.avatar,
14 name: state => state.user.name, 14 name: state => state.user.name,
15 userInfo: state => state.user.userInfo,
15 userData: state => state.user.userData, 16 userData: state => state.user.userData,
16 permission_routes: state => state.permission.routes, 17 permission_routes: state => state.permission.routes,
17 addRoutes: state => state.permission.addRoutes, 18 addRoutes: state => state.permission.addRoutes,
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-28 16:33:19 4 * @LastEditTime: 2023-07-28 16:33:19
5 */ 5 */
6 import { getUserInfo } from '@/api/user' 6 import { getUserInfo } from '@/api/user'
7 import { log } from 'bpmn-js-token-simulation'
7 const state = { 8 const state = {
8 name: '', 9 name: '',
10 userInfo:{},
9 avatar: 'https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png', 11 avatar: 'https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png',
10 isRefresh: false, 12 isRefresh: false,
11 // 业务流程刷新 13 // 业务流程刷新
...@@ -14,8 +16,10 @@ const state = { ...@@ -14,8 +16,10 @@ const state = {
14 const mutations = { 16 const mutations = {
15 SET_NAME: (state, data) => { 17 SET_NAME: (state, data) => {
16 state.name = data.loginName 18 state.name = data.loginName
19 state.userInfo = data
17 }, 20 },
18 REFRESH: (state, data) => { 21 REFRESH: (state, data) => {
22
19 state.isRefresh = data 23 state.isRefresh = data
20 }, 24 },
21 SETWORKFRESH: (state, data) => { 25 SETWORKFRESH: (state, data) => {
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
29 <div> 29 <div>
30 <p v-if="item.operate=='D'">{{ item.qllxmc }} <span class="tpcolor">(删除)</span></p> 30 <p v-if="item.operate=='D'">{{ item.qllxmc }} <span class="tpcolor">(删除)</span></p>
31 <p v-else>{{ item.qllxmc }} <span class="tpcolor">({{ item.operate=="U"?"编辑":"新增" }})</span></p> 31 <p v-else>{{ item.qllxmc }} <span class="tpcolor">({{ item.operate=="U"?"编辑":"新增" }})</span></p>
32 <div class="ywh">（业务号：{{ item.blywh}}）</div>
32 </div> 33 </div>
33 <i class="el-icon-delete" @click.stop="handleDel(item)" v-if="delel"></i> 34 <i class="el-icon-delete" @click.stop="handleDel(item)" v-if="delel"></i>
34 </el-menu-item> 35 </el-menu-item>
...@@ -75,6 +76,7 @@ ...@@ -75,6 +76,7 @@
75 qllx: this.$route.query.qllx, 76 qllx: this.$route.query.qllx,
76 // 默认选中 77 // 默认选中
77 activeIndex: "0", 78 activeIndex: "0",
79 clickindex:"",
78 // 折叠 80 // 折叠
79 isShowdrawer: true, 81 isShowdrawer: true,
80 delel: true, 82 delel: true,
...@@ -138,7 +140,6 @@ ...@@ -138,7 +140,6 @@
138 * @author: renchao 140 * @author: renchao
139 */ 141 */
140 getleftMenubl (row) { 142 getleftMenubl (row) {
141
142 leftMenubl(this.bsmSlsq).then((res) => { 143 leftMenubl(this.bsmSlsq).then((res) => {
143 this.supplementarylist = res.result; 144 this.supplementarylist = res.result;
144 if (row) { 145 if (row) {
...@@ -149,6 +150,10 @@ ...@@ -149,6 +150,10 @@
149 this.unitClick(index) 150 this.unitClick(index)
150 } 151 }
151 }) 152 })
153 if(row=="change"){
154 this.unitClick(this.clickindex)
155
156 }
152 }else{ 157 }else{
153 if (this.supplementarylist.length) { 158 if (this.supplementarylist.length) {
154 this.unitClick(0) 159 this.unitClick(0)
...@@ -183,6 +188,7 @@ ...@@ -183,6 +188,7 @@
183 * @author: renchao 188 * @author: renchao
184 */ 189 */
185 unitClick (index) { 190 unitClick (index) {
191 this.clickindex=index
186 this.currentSelectProps = this.supplementarylist[index]; 192 this.currentSelectProps = this.supplementarylist[index];
187 this.$emit("getCurrentSelectProps", this.currentSelectProps); 193 this.$emit("getCurrentSelectProps", this.currentSelectProps);
188 }, 194 },
...@@ -317,7 +323,11 @@ ...@@ -317,7 +323,11 @@
317 color: red; 323 color: red;
318 line-height: 22px; 324 line-height: 22px;
319 } 325 }
326 .ywh{
327 font-size: 12px;
328 }
320 .el-icon-delete { 329 .el-icon-delete {
330 margin-top: 10px;
321 margin-right: 3px; 331 margin-right: 3px;
322 // background-color: saddlebrown; 332 // background-color: saddlebrown;
323 height: 27px; 333 height: 27px;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 :show-message="false" 4 :show-message="false"
5 * @LastEditTime: 2023-06-25 15:52:42 5 * @LastEditTime: 2023-08-01 09:45:22
6 --> 6 -->
7 <template> 7 <template>
8 <!-- 受理信息 --> 8 <!-- 受理信息 -->
...@@ -46,7 +46,10 @@ ...@@ -46,7 +46,10 @@
46 </div> 46 </div>
47 <el-row :gutter="10"> 47 <el-row :gutter="10">
48 <el-col :span="8"> 48 <el-col :span="8">
49 <el-form-item label="查封不动产权信息：" prop="ztQlxx.bdcqzh" :rules="rules.ztQlxxrules"> 49 <el-form-item
50 label="查封不动产权信息："
51 prop="ztQlxx.bdcqzh"
52 :rules="rules.ztQlxxrules">
50 <select-table 53 <select-table
51 v-model="ruleForm.ztQlxx" 54 v-model="ruleForm.ztQlxx"
52 :table-width="550" 55 :table-width="550"
...@@ -157,7 +160,10 @@ ...@@ -157,7 +160,10 @@
157 </el-form-item> 160 </el-form-item>
158 </el-col> 161 </el-col>
159 <el-col :span="8"> 162 <el-col :span="8">
160 <el-form-item label="业务号："> 163 <el-form-item
164 label="业务号："
165 prop="qlxx.ywh"
166 :rules="rules.ywhrules">
161 <el-input v-model="ruleForm.qlxx.ywh"></el-input> 167 <el-input v-model="ruleForm.qlxx.ywh"></el-input>
162 </el-form-item> 168 </el-form-item>
163 </el-col> 169 </el-col>
...@@ -447,7 +453,6 @@ ...@@ -447,7 +453,6 @@
447 ], 453 ],
448 ableOperation: false, 454 ableOperation: false,
449 //传递参数\ 455 //传递参数\
450
451 ssQlxxList: [], 456 ssQlxxList: [],
452 ztQlxxList: [], 457 ztQlxxList: [],
453 rules: { 458 rules: {
......
...@@ -792,6 +792,7 @@ export default { ...@@ -792,6 +792,7 @@ export default {
792 message: "保存成功！", 792 message: "保存成功！",
793 type: "success", 793 type: "success",
794 }); 794 });
795 this.$parent.changeywh()
795 this.$store.dispatch("user/refreshPage", true); 796 this.$store.dispatch("user/refreshPage", true);
796 } else { 797 } else {
797 this.$message({ 798 this.$message({
......
...@@ -676,6 +676,7 @@ export default { ...@@ -676,6 +676,7 @@ export default {
676 message: "保存成功！", 676 message: "保存成功！",
677 type: "success", 677 type: "success",
678 }); 678 });
679 this.$parent.changeywh()
679 this.$store.dispatch("user/refreshPage", true); 680 this.$store.dispatch("user/refreshPage", true);
680 } else { 681 } else {
681 this.$message({ 682 this.$message({
......
...@@ -560,7 +560,6 @@ ...@@ -560,7 +560,6 @@
560 this.ssqlxxshow = true; 560 this.ssqlxxshow = true;
561 } 561 }
562 }, 562 },
563
564 /** 563 /**
565 * @description: loadData 564 * @description: loadData
566 * @author: renchao 565 * @author: renchao
...@@ -699,6 +698,7 @@ ...@@ -699,6 +698,7 @@
699 message: "保存成功！", 698 message: "保存成功！",
700 type: "success", 699 type: "success",
701 }); 700 });
701 this.$parent.changeywh()
702 this.$store.dispatch("user/refreshPage", true); 702 this.$store.dispatch("user/refreshPage", true);
703 } else { 703 } else {
704 this.$message({ 704 this.$message({
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-31 10:03:05 4 * @LastEditTime: 2023-08-01 09:46:29
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 受理信息 --> 7 <!-- 受理信息 -->
......
...@@ -719,6 +719,7 @@ export default { ...@@ -719,6 +719,7 @@ export default {
719 message: "保存成功！", 719 message: "保存成功！",
720 type: "success", 720 type: "success",
721 }); 721 });
722 this.$parent.changeywh()
722 this.$store.dispatch("user/refreshPage", true); 723 this.$store.dispatch("user/refreshPage", true);
723 } else { 724 } else {
724 this.$message({ 725 this.$message({
......
...@@ -618,6 +618,7 @@ export default { ...@@ -618,6 +618,7 @@ export default {
618 message: "保存成功！", 618 message: "保存成功！",
619 type: "success", 619 type: "success",
620 }); 620 });
621 this.$parent.changeywh()
621 this.$store.dispatch("user/refreshPage", true); 622 this.$store.dispatch("user/refreshPage", true);
622 } else { 623 } else {
623 this.$message({ 624 this.$message({
......
...@@ -616,6 +616,7 @@ export default { ...@@ -616,6 +616,7 @@ export default {
616 message: "保存成功！", 616 message: "保存成功！",
617 type: "success", 617 type: "success",
618 }); 618 });
619 this.$parent.changeywh()
619 this.$store.dispatch("user/refreshPage", true); 620 this.$store.dispatch("user/refreshPage", true);
620 } else { 621 } else {
621 this.$message({ 622 this.$message({
......
...@@ -275,7 +275,7 @@ export default { ...@@ -275,7 +275,7 @@ export default {
275 height: 100%; 275 height: 100%;
276 line-height: 80px; 276 line-height: 80px;
277 border: 1px solid $borderColor; 277 border: 1px solid $borderColor;
278 text-align: center; 278 margin: auto;
279 font-size: 22px; 279 font-size: 22px;
280 font-weight: 400; 280 font-weight: 400;
281 } 281 }
......
1 <!-- 1 <!--
2 * @Description :宗地基本信息 2 * @Description :宗地基本信息
3 * @Autor : miaofang 3 * @Autor : miaofang
4 * @LastEditTime : 2023-05-24 15:08:51 4 * @LastEditTime : 2023-07-31 17:21:56
5 --> 5 -->
6 <template> 6 <template>
7 <div class="tableDivCss"> 7 <div class="tableDivCss">
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
11 </tr> 11 </tr>
12 <tr> 12 <tr>
13 <td>单位</td> 13 <td>单位</td>
14 <td colspan="4">{{ zdjbxx.mjdw | dictionary('A7') }}</td> 14 <td colspan="4">{{ zdjbxx.mjdw | dictionary("A7") }}</td>
15 </tr> 15 </tr>
16 <tr> 16 <tr>
17 <td>不动产类型</td> 17 <td>不动产类型</td>
...@@ -25,10 +25,10 @@ ...@@ -25,10 +25,10 @@
25 <td rowspan="8">土地状况</td> 25 <td rowspan="8">土地状况</td>
26 </tr> 26 </tr>
27 <tr> 27 <tr>
28 <td style="width:15%">宗地面积</td> 28 <td style="width: 15%">宗地面积</td>
29 <td style="width:30%">{{ zdjbxx.zdmj }}m²</td> 29 <td style="width: 30%">{{ zdjbxx.zdmj }}m²</td>
30 <td style="width:15%">用途</td> 30 <td style="width: 15%">用途</td>
31 <td style="width:30%">{{ zdjbxx.ghytmc }}</td> 31 <td style="width: 30%">{{ zdjbxx.yt | dicyt("tdyt") }}</td>
32 </tr> 32 </tr>
33 <tr> 33 <tr>
34 <td>等级</td> 34 <td>等级</td>
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
44 </tr> 44 </tr>
45 <tr> 45 <tr>
46 <td>权利设定方式</td> 46 <td>权利设定方式</td>
47 <td>{{zdjbxx.qlsdfs | dictionary('A10')}}</td> 47 <td>{{ zdjbxx.qlsdfs | dictionary("A10") }}</td>
48 <td>容积率</td> 48 <td>容积率</td>
49 <td>{{ zdjbxx.rjl }}</td> 49 <td>{{ zdjbxx.rjl }}</td>
50 </tr> 50 </tr>
...@@ -111,7 +111,6 @@ ...@@ -111,7 +111,6 @@
111 <td class="bhqkTh">{{ item.label }}</td> 111 <td class="bhqkTh">{{ item.label }}</td>
112 </tr> 112 </tr>
113 </table> --> 113 </table> -->
114
115 </tr> 114 </tr>
116 115
117 <tr v-if="showGroup"> 116 <tr v-if="showGroup">
...@@ -126,90 +125,116 @@ ...@@ -126,90 +125,116 @@
126 <td>{{ zdbhqks[0].djsj }}</td> 125 <td>{{ zdbhqks[0].djsj }}</td>
127 <td>{{ zdbhqks[0].dbr }}</td> 126 <td>{{ zdbhqks[0].dbr }}</td>
128 </tr> --> 127 </tr> -->
129
130 </table> 128 </table>
131 </div> 129 </div>
132 </template> 130 </template>
133 131
134 <script> 132 <script>
135 import store from '@/store/index.js' 133 import store from "@/store/index.js";
136 import { getZdjjxxBybdcdyid } from "@/api/djbDetail.js"; 134 import { getZdjjxxBybdcdyid } from "@/api/djbDetail.js";
137 135
138 export default { 136 export default {
139 data () { 137 data() {
140 return { 138 return {
141 bhqkColumns: [ 139 bhqkColumns: [
142 { 140 {
143 prop: "ssywh", 141 prop: "ssywh",
144 label: "上手业务号", 142 label: "上手业务号",
145 }, 143 },
146 { 144 {
147 prop: "zddm", 145 prop: "zddm",
148 label: "宗地代码", 146 label: "宗地代码",
149 }, 147 },
150 { 148 {
151 prop: "bhqzddm", 149 prop: "bhqzddm",
152 label: "变化前宗地代码", 150 label: "变化前宗地代码",
153 }, 151 },
154 { 152 {
155 prop: "bhnr", 153 prop: "bhnr",
156 label: "变化内容", 154 label: "变化内容",
157 }, 155 },
158 { 156 {
159 prop: "bhyy", 157 prop: "bhyy",
160 label: "变化原因", 158 label: "变化原因",
161 }, 159 },
162 { 160 {
163 prop: "djsj", 161 prop: "djsj",
164 label: "登记时间", 162 label: "登记时间",
165 }, 163 },
166 { 164 {
167 prop: "dbr", 165 prop: "dbr",
168 label: "登簿人", 166 label: "登簿人",
169 }, 167 },
170 { 168 {
171 prop: "fj", 169 prop: "fj",
172 label: "附记", 170 label: "附记",
173 }, 171 },
174 ], 172 ],
175 bhqkTableWidth: 745, 173 bhqkTableWidth: 745,
176 zdjbxx: {}, 174 zdjbxx: {},
177 zdbhqks: [], 175 zdbhqks: [],
178 propsParam: this.$attrs, 176 propsParam: this.$attrs,
179 showGroup: false, 177 showGroup: false,
180 bdclxList: ["", "宗地", "宗海", "自然幢", "多幢", "构筑物", "林权", "户"] 178 bdclxList: ["", "宗地", "宗海", "自然幢", "多幢", "构筑物", "林权", "户"],
179 foundItemaa: {},
180 foundItemaaa: {},
181 };
182 },
183 filters: {
184 dictionary: function (value, param) {
185 const foundItem = store.getters.dictData[param].find(
186 (item) => item.dcode === String(value)
187 );
188 if (foundItem) {
189 return foundItem.dname;
181 } 190 }
182 }, 191 },
183 filters: { 192 dicyt: function (value, param) {
184 dictionary: function (value, param) { 193 const res = store.getters.dictData[param].filter((item) => {
185 const foundItem = store.getters.dictData[param].find(item => item.dcode === String(value)) 194 if (item.dcode === String(value)) {
186 if (foundItem) { 195 return item;
187 return foundItem.dname 196 } else {
197 if (item.children.length) {
198 const res2 = item.children.filter((items) => {
199 if (items.dcode === String(value)) {
200 return items;
201 }
202 });
203 if (res2.length) {
204 return res2;
205
206 }
207
208 }
188 } 209 }
210 });
211 if (res[0]) {
212 return res[0].dname
189 } 213 }
190 }, 214 },
191 created () { 215 },
192 this.loadData() 216 created() {
193 }, 217 this.loadData();
194 methods: { 218 },
195 /** 219 methods: {
196 * @description: loadData 220 /**
197 * @author: renchao 221 * @description: loadData
198 */ 222 * @author: renchao
199 loadData () { 223 */
200 getZdjjxxBybdcdyid({ bdcdyid: this.propsParam.bdcdyid }).then((res) => { 224 loadData() {
201 if (res.code === 200) { 225 getZdjjxxBybdcdyid({ bdcdyid: this.propsParam.bdcdyid }).then((res) => {
202 this.zdjbxx = res.result.zdjbxx; 226 if (res.code === 200) {
203 this.zdbhqks = res.result.zdbhqkList; 227 this.zdjbxx = res.result.zdjbxx;
204 if (this.zdbhqks != null && this.zdbhqks.length > 0) { 228 this.zdbhqks = res.result.zdbhqkList;
205 this.showGroup = true; 229 if (this.zdbhqks != null && this.zdbhqks.length > 0) {
206 } 230 this.showGroup = true;
207 } 231 }
208 }) 232 }
209 } 233 });
210 } 234 },
211 } 235 },
236 };
212 </script> 237 </script>
213 <style lang="scss" scoped> 238 <style lang="scss" scoped>
214 @import "~@/styles/tablecss.scss"; 239 @import "~@/styles/tablecss.scss";
215 </style> 240 </style>
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-31 13:59:45 4 * @LastEditTime: 2023-08-01 09:41:01
5 --> 5 -->
6 <template> 6 <template>
7 <div class="clxx"> 7 <div class="clxx">
...@@ -68,6 +68,16 @@ ...@@ -68,6 +68,16 @@
68 created () { 68 created () {
69 this.clmlInitList(1) 69 this.clmlInitList(1)
70 }, 70 },
71 computed: {
72 ...mapGetters(['workFresh'])
73 },
74 watch: {
75 workFresh: {
76 handler (newVal, oldVal) {
77 if (newVal) this.clmlInitList(1)
78 }
79 }
80 },
71 mounted () { 81 mounted () {
72 this.ableOperation = this.$parent.ableOperation 82 this.ableOperation = this.$parent.ableOperation
73 }, 83 },
...@@ -254,7 +264,8 @@ ...@@ -254,7 +264,8 @@
254 viewDetail () { 264 viewDetail () {
255 this.$popupDialog("查看明细", "workflow/components/dialog/clxxDetailDialog", { 265 this.$popupDialog("查看明细", "workflow/components/dialog/clxxDetailDialog", {
256 data: this.tableData, 266 data: this.tableData,
257 unitData: this.$parent.unitData 267 unitData: this.$parent.unitData,
268 ableOperation: this.$parent.ableOperation
258 }, "60%") 269 }, "60%")
259 }, 270 },
260 //设置tableData 271 //设置tableData
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-31 14:27:07 4 * @LastEditTime: 2023-08-01 09:43:19
5 --> 5 -->
6 <template> 6 <template>
7 <div class="clmlmx-box"> 7 <div class="clmlmx-box">
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
10 </lb-table> 10 </lb-table>
11 <div class="text-center"> 11 <div class="text-center">
12 <el-button @click="$popupCacel">取消</el-button> 12 <el-button @click="$popupCacel">取消</el-button>
13 <el-button type="primary" @click="handleSubmit" v-if="formData.ableOperation">确定</el-button>
13 </div> 14 </div>
14 </div> 15 </div>
15 </template> 16 </template>
...@@ -58,16 +59,28 @@ ...@@ -58,16 +59,28 @@
58 { 59 {
59 prop: "sjmc", 60 prop: "sjmc",
60 label: "材料名称", 61 label: "材料名称",
62 render: (h, scope) => {
63 return (
64 <el-input value={scope.row[scope.column.property]} onInput={(val) => { scope.row[scope.column.property] = val }}></el-input>
65 )
66 }
61 }, 67 },
62 { 68 {
63 prop: "sjlx", 69 prop: "sjlx",
64 label: "材料类型", 70 label: "材料类型",
65 width: "80", 71 width: "110",
66 render: (h, scope) => { 72 render: (h, scope) => {
67 return ( 73 return (
68 <div> 74 <el-select value={scope.row[scope.column.property]}
69 <span>{this.dicStatus(scope.row.sjlx, "A40")}</span> 75 onChange={(val) => { scope.row[scope.column.property] = val }}>
70 </div> 76 {
77 store.getters.dictData['A40'].map(option => {
78 return (
79 <el-option label={option.dname} value={option.dcode}></el-option>
80 )
81 })
82 }
83 </el-select>
71 ) 84 )
72 } 85 }
73 }, 86 },
...@@ -127,7 +140,7 @@ ...@@ -127,7 +140,7 @@
127 }, 140 },
128 { 141 {
129 label: "操作", 142 label: "操作",
130 width: "80", 143 width: "100",
131 render: (h, scope) => { 144 render: (h, scope) => {
132 return ( 145 return (
133 <div> 146 <div>
...@@ -149,10 +162,13 @@ ...@@ -149,10 +162,13 @@
149 > 162 >
150 下移 163 下移
151 </el-button> 164 </el-button>
152 </div> 165 <i v-show={scope.row.isrequired != '1' && formData.ableOperation} onClick={() => {
153 ); 166 this.handleDelete(scope.$index, scope.row);
154 }, 167 }} class="el-icon-delete pointer" style="color:#409EFF;margin-left:5px;position: relative;top: 1px;"></i>
155 }, 168 </div >
169 )
170 }
171 }
156 ], 172 ],
157 key: 0, 173 key: 0,
158 tableData: [] 174 tableData: []
...@@ -168,6 +184,12 @@ ...@@ -168,6 +184,12 @@
168 } 184 }
169 }, 185 },
170 methods: { 186 methods: {
187 handleSubmit () {
188 // saveClml(this.tableData).then(res => {
189 // console.log(res, '11111111111111');
190 // })
191 // store.dispatch('user/reWorkFresh', true)
192 },
171 /** 193 /**
172 * @description: 材料目录明细初始化 194 * @description: 材料目录明细初始化
173 * @author: renchao 195 * @author: renchao
...@@ -187,7 +209,6 @@ ...@@ -187,7 +209,6 @@
187 } else { 209 } else {
188 this.tableData = [] 210 this.tableData = []
189 } 211 }
190 console.log(this.tableData, 'this.tableData');
191 } else { 212 } else {
192 this.$message.error(res.message) 213 this.$message.error(res.message)
193 } 214 }
...@@ -248,7 +269,6 @@ ...@@ -248,7 +269,6 @@
248 } 269 }
249 }) 270 })
250 }, 271 },
251 // 材料目录删除
252 /** 272 /**
253 * @description: 材料目录删除 273 * @description: 材料目录删除
254 * @param {*} index 274 * @param {*} index
...@@ -268,7 +288,7 @@ ...@@ -268,7 +288,7 @@
268 if (res == 200) { 288 if (res == 200) {
269 that.$message({ 289 that.$message({
270 message: "删除成功", 290 message: "删除成功",
271 type: "success", 291 type: "success"
272 }) 292 })
273 } 293 }
274 } 294 }
......
1 <!-- 1 <!--
2 * @Description: 功能：审批意见 2 * @Description: 审批意见
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-20 09:52:48 4 * @LastEditTime: 2023-05-17 10:41:24
5 --> 5 -->
6 <template> 6 <template>
7 <div class='spyj loadingtext'> 7 <div class="spyj loadingtext">
8 <div class="box"> 8 <div class="box">
9 <b class="spyj_title">审批表</b> 9 <div class="spyj_title">
10 <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px"> 10 <div class="righttitle">审批表</div>
11 <div class="spyj_form" v-for="(item, index) in tableData" :key="index"> 11 </div>
12 <div class="item_left"> 12
13 {{ item.jdmc }}意见 13 <div v-for="(item, index) in tableData" :key="index">
14 </div> 14 <el-form
15 <div class="item_right"> 15 :model="tableData[index]"
16 <el-row> 16 label-width="120px"
17 <el-col :span="24"> 17 ref="ruleFormRef'"
18 <el-form-item label-width="0" class="opinion_item" prop="shyj"> 18 >
19 <el-input type="textarea" :rows="4" class="opinion" placeholder="请输入审批意见" 19 <div class="spyj_form">
20 v-if="item.stepShjy == '1' && ableOperation" v-model="ruleForm.shyj"></el-input> 20 <div class="item_left">
21 <el-input type="textarea" :rows="4" class="opinion" v-model="item.shyj" v-else :disabled="true"> 21 <div class="right">{{ jdmc }}意见</div>
22 </el-input> 22 </div>
23 <el-button class="opinion_btn" @click="commonOpinion" 23 <div class="item_right">
24 v-if="item.stepShjy == '1' && ableOperation">常用意见</el-button> 24 <el-row>
25 </el-form-item> 25 <el-col :span="24">
26 </el-col> 26 <el-form-item label-width="0" class="opinion_item">
27 </el-row> 27 <el-input
28 <el-row> 28 :disabled="!ableOperation"
29 <el-col :span="16"> 29 type="textarea"
30 <el-form-item label="审查人" prop="shryxm"> 30 :rows="4"
31 {{ item.shryxm }} 31 class="opinion"
32 </el-form-item> 32 placeholder="请输入审批意见"
33 </el-col> 33 v-model="item.shyj"
34 <el-col :span="8"> 34 ></el-input>
35 <el-form-item label="审核时间" prop="shjssj" :key="refresh"> 35 <el-button
36 {{ item.shjssj }} 36 class="opinion_btn"
37 </el-form-item> 37 @click="commonOpinion(index)"
38 </el-col> 38 v-if="ableOperation"
39 </el-row> 39 >常用意见</el-button
40 >
41 </el-form-item>
42 </el-col>
43 </el-row>
44 <el-row>
45 <el-col :span="16">
46 <el-form-item label="审查人">
47 <el-input
48 :disabled="!ableOperation"
49 v-model="item.shryxm"
50 ></el-input>
51 </el-form-item>
52 </el-col>
53 <el-col :span="8">
54 <el-form-item class="sjxzq" label="审核时间">
55 <el-date-picker
56 :disabled="!ableOperation"
57 v-model="item.shjssj"
58 type="date"
59 placeholder="选择日期"
60 value-format="yyyy-MM-dd HH:mm:ss"
61 format="yyyy-MM-dd"
62 >
63 </el-date-picker>
64 </el-form-item>
65 </el-col>
66 </el-row>
67 </div>
40 </div> 68 </div>
41 </div> 69 </el-form>
42 <div class="submit_button" v-if="ableOperation"> 70 </div>
43 <el-button type="primary" @click="onSubmit">保存</el-button> 71 <div class="submit_button" v-if="ableOperation">
44 </div> 72 <el-button type="primary" @click="onSubmit()">保存</el-button>
45 </el-form> 73 </div>
46 </div> 74 </div>
47 <el-empty v-if="isNoData" description="暂无数据"></el-empty> 75 <!-- <el-empty v-if="isNoData" description="暂无数据"></el-empty> -->
48 </div> 76 </div>
49 </template> 77 </template>
50 <script> 78 <script>
51 import { getSpyjList, saveSpyj, saveSpyjBySlsq } from "@/api/opinion.js"; 79 import { saveSpyjBySlsq, getSpyjList } from "@/api/opinion.js";
52 import { mapGetters } from 'vuex' 80 import { mapGetters } from "vuex";
53 export default { 81 export default {
54 computed: { 82 computed: {
55 ...mapGetters(['userData', 'yjsqOptions']) 83 ...mapGetters(["userData", "yjsqOptions", "userInfo"]),
84 },
85 data() {
86 return {
87 isNoData: false,
88 currentindex: 0,
89 bsmSlsq: "",
90 ableOperation: false,
91 bsmSlsq: this.$route.query.bsmSlsq,
92 bestepid: this.$route.query.bestepid,
93 propsParam: {},
94 tableData: [],
95 falg: false,
96 falg1: false,
97 jdmc: "",
98 indexdqlc: 0,
99 };
100 },
101
102 watch: {
103 yjsqOptions: {
104 handler(val) {
105 console.log("val", val);
106 this.add(val);
107 },
108 deep: true,
109 immediate: true,
56 }, 110 },
57 data () { 111 },
58 return { 112 created() {},
59 isNoData: false, 113 mounted() {
60 bsmSlsq: '', 114 this.propsParam = this.$attrs;
61 //刷新值 115 console.log("this.$parent.dqhj", this.$parent.dqhj);
62 refresh: 10, 116 this.ableOperation = this.$parent.currentSelectTab.ableOperation;
63 ableOperation: true, 117 // this.ableOperation = this.$parent.ableOperation;
64 bsmSlsq: this.$route.query.bsmSlsq, 118 this.getShList();
65 bestepid: this.$route.query.bestepid, 119
66 ruleForm: {}, 120 switch (this.$parent.dqhj) {
67 rules: { 121 case "cs":
68 shyj: [ 122 this.indexdqlc = 0;
69 { required: true, message: '请输入审批意见', trigger: 'blur' } 123 this.jdmc = "初审";
70 ], 124 break;
71 }, 125 case "fs":
72 tableData: [], 126 this.indexdqlc = 1;
73 propsParam: {} 127 this.jdmc = "复审";
74 } 128 break;
129 case "hd":
130 this.indexdqlc = 2;
131 this.jdmc = "核定";
132 break;
133 }
134 },
135 methods: {
136 /**
137 * @description: getShList
138 * @param {*} obj
139 * @author: renchao
140 */
141 getShList() {
142 let that = this;
143 this.$startLoading();
144 console.log(this.userInfo);
145 var formdata = new FormData();
146 formdata.append("bsmBusiness",this.$parent.bsmSlsq);
147 formdata.append("bestepid", this.$route.query.bestepid);
148
149 getSpyjList(formdata).then((res) => {
150 this.$endLoading();
151 if (res.code === 200 && res.result) {
152 this.tableData = res.result;
153 if (this.tableData.length == 0) {
154 this.tableData.push({ jdmc: "初审" });
155 }
156 console.log("this.tableData", this.tableData);
157 }
158 });
75 }, 159 },
76 watch: { 160 /**
77 yjsqOptions: { 161 * @description: judgment
78 handler (val) { 162 * @param {*} obj
79 this.ruleForm.shyj = val 163 * @author: renchao
80 }, 164 */
81 deep: true, 165 judgment(obj) {},
82 immediate: true 166 /**
83 }, 167 * @description: onSubmit
168 * @author: renchao
169 */
170 onSubmit() {
171 this.tableData.forEach((item, index) => {
172 item["bsmSlsq"] = this.$parent.bsmSlsq;
173 item["bestepid"] = this.$parent.bestepid;
174 item["shryxm"] = this.userInfo.name;
175 item["userid"] = this.userInfo.id;
176 item["jddm"] = this.$parent.dqhj;
177 item["jdmc"] = this.jdmc;
178 item["shjssj"] = item.shkssj;
179 item["czjg"] = "1";
180 item["stepid"] = "1";
181
182 });
183 console.log("this.tableData", this.tableData);
184 saveSpyjBySlsq(this.tableData).then((res) => {
185 if (res.code === 200) {
186 this.$message.success("保存成功");
187 this.refresh += 1;
188 } else {
189 this.$message.error(res.message);
190 }
191 });
192 // } else {
193 // return false;
194 // }
84 }, 195 },
85 mounted () { 196 //打开常用意见列表弹窗
86 this.ableOperation = this.$parent.currentSelectTab.ableOperation 197 /**
87 this.list(); 198 * @description: 打开常用意见列表弹窗
199 * @param {*} index
200 * @author: renchao
201 */
202 commonOpinion(index) {
203 this.currentindex = index;
204 this.$popupDialog(
205 "常用意见",
206 "workflow/components/dialog/commonOpinion",
207 {},
208 "70%",
209 true
210 );
88 }, 211 },
89 methods: { 212 /**
90 //审批意见数据初始化 213 * @description: add
91 /** 214 * @param {*} val
92 * @description: 审批意见数据初始化 215 * @author: renchao
93 * @author: renchao 216 */
94 */ 217 add(val) {
95 list () { 218 if (val != "") {
96 let that = this 219 this.$set(this.tableData[this.currentindex], "shyj", val);
97 this.$startLoading()
98 var formdata = new FormData();
99 formdata.append("bsmBusiness", this.propsParam.bsmBusiness);
100 formdata.append("bestepid", this.$route.query.bestepid);
101 getSpyjList(formdata).then((res) => {
102 this.$endLoading()
103 if (res.code === 200 && res.result) {
104 this.tableData = res.result ? res.result : []
105 if (res.result.length == 0) {
106 that.isNoData = true
107 }
108 this.ruleForm = res.result[res.result.length - 1]
109 }
110 })
111 },
112 /**
113 * @description: onSubmit
114 * @author: renchao
115 */
116 onSubmit () {
117 this.ruleForm.bsmSlsq = this.bsmSlsq
118 this.ruleForm.bestepid = this.bestepid
119 saveSpyjBySlsq(this.ruleForm).then(res => {
120 if (res.code === 200) {
121 this.$message.success("保存成功")
122 this.refresh += 1
123 } else {
124 this.$message.error(res.message)
125 }
126 })
127 },
128 //打开常用意见列表弹窗
129 /**
130 * @description: 打开常用意见列表弹窗
131 * @author: renchao
132 */
133 commonOpinion () {
134 this.$popupDialog("常用意见", "workflow/components/dialog/commonOpinion", {}, "70%", true)
135 },
136 //使用常用意见
137 /**
138 * @description: 使用常用意见
139 * @author: renchao
140 */
141 useOpinion (opinion) {
142 this.ruleForm.shyj = opinion
143 } 220 }
144 } 221 },
145 } 222 },
223 };
146 </script> 224 </script>
147 <style scoped lang='scss'> 225 <style scoped lang="scss">
148 @import "~@/styles/mixin.scss"; 226 @import "~@/styles/mixin.scss";
149 227
150 .spyj { 228 .spyj {
229 width: 100%;
230 height: 100%;
231 background-color: #f5f5f5;
232 padding: 5px;
233 .box {
234 overflow-x: auto;
151 width: 100%; 235 width: 100%;
152 height: 100%; 236 height: 95%;
153 background-color: #f5f5f5; 237 background: #fff;
154 padding: 5px; 238 text-align: center;
155 .box { 239 padding: 4px;
156 overflow-x: auto; 240 overflow-y: scroll;
241 padding-top: 20px;
242 padding: 20px 40px;
243 .spyj_title {
157 width: 100%; 244 width: 100%;
158 height: 95%; 245 height: 80px;
159 background: #fff; 246 border: 1px solid $borderColor;
160 text-align: center; 247 background-color: #eceef2;
161 padding: 4px; 248 display: flex;
162 overflow-y: scroll;
163 padding-top: 20px;
164 padding: 20px 40px;
165 } 249 }
166 .spyj_title { 250 .leftadd {
167 line-height: 68px; 251 width: 3%;
252 height: 100%;
253 display: flex;
254 font-size: 14px;
255 text-indent: 20px;
256 align-items: center;
257 border: 1px solid $borderColor;
258 }
259 .righttitle {
260 width: 80%;
261 height: 100%;
262 line-height: 80px;
168 border: 1px solid $borderColor; 263 border: 1px solid $borderColor;
169 text-align: center; 264 margin: auto;
170 font-size: 22px; 265 font-size: 22px;
171 font-weight: 400; 266 font-weight: 400;
172 background-color: #eceef2;
173 display: block;
174 border-bottom: none;
175 } 267 }
268 }
176 269
177 /deep/.el-form-item { 270 /deep/.el-form-item {
178 margin-bottom: 0; 271 margin-bottom: 0;
179 } 272 }
180 273
181 .bottom10 { 274 .bottom10 {
182 margin-bottom: 15px; 275 margin-bottom: 15px;
183 } 276 }
184 277
185 .spyj_form { 278 .spyj_form {
279 display: flex;
280 border: 1px solid $borderColor;
281
282 .item_left {
283 width: 150px;
284 background-color: #f8f8fa;
285 color: #606266;
186 display: flex; 286 display: flex;
187 border: 1px solid $borderColor; 287 font-size: 14px;
288 text-indent: 50px;
289 align-items: center;
290 border-right: 1px solid $borderColor;
291 }
292
293 .item_right {
294 flex: 1;
295 width: 100%;
188 296
189 .item_left { 297 /deep/.el-form-item__label {
190 width: 150px;
191 background-color: #f8f8fa; 298 background-color: #f8f8fa;
192 color: #606266;
193 display: flex;
194 font-size: 14px;
195 text-indent: 80px;
196 align-items: center;
197 border-right: 1px solid $borderColor;
198 } 299 }
199 300 /deep/.el-form-item__content {
200 .item_right { 301 display: block;
201 flex: 1; 302 text-align: left;
202 width: 100%; 303 }
203 304 .opinion_item {
204 /deep/.el-form-item__label { 305 /deep/.el-form-item__error {
205 background-color: #f8f8fa; 306 margin-top: -16px !important;
206 } 307 left: 3px;
207 /deep/.el-form-item__content {
208 display: block;
209 text-align: left;
210 text-indent: 10px;
211 }
212 .opinion_item {
213 /deep/.el-form-item__error {
214 margin-top: -16px !important;
215 left: 3px;
216 }
217
218 border-bottom: 1px solid $borderColor;
219 } 308 }
309 border-bottom: 1px solid $borderColor;
310 }
220 311
221 .opinion { 312 .opinion {
222 position: relative; 313 position: relative;
223 font-size: 14px; 314 font-size: 14px;
224 315
225 /deep/.el-textarea__inner { 316 /deep/.el-textarea__inner {
226 border: none; 317 border: none;
227 }
228 } 318 }
319 }
229 320
230 .opinion_btn { 321 .opinion_btn {
231 position: absolute; 322 position: absolute;
232 right: 15px; 323 right: 15px;
233 bottom: 10px; 324 bottom: 10px;
234 }
235 } 325 }
236 } 326 }
327 }
237 328
238 .submit_button { 329 .submit_button {
239 text-align: center; 330 text-align: center;
240 margin: 15px 0; 331 margin: 15px 0;
241 } 332 }
333
334 .el-date-editor.el-input {
335 width: 100%;
242 } 336 }
337 }
243 </style> 338 </style>
......
...@@ -73,9 +73,10 @@ ...@@ -73,9 +73,10 @@
73 * @author: renchao 73 * @author: renchao
74 */ 74 */
75 onSubmit () { 75 onSubmit () {
76 console.log(this.formData.bsmSlsq); 76 if(!this.outstepopinion){
77 console.log(this.selectItem); 77 this.$message.error("请填写退回意见");
78 sendBackTask({ 78 }else{
79 sendBackTask({
79 bsmSlsq: this.formData.bsmSlsq, 80 bsmSlsq: this.formData.bsmSlsq,
80 backNodeList: [this.selectItem], 81 backNodeList: [this.selectItem],
81 message:this.outstepopinion 82 message:this.outstepopinion
...@@ -92,6 +93,7 @@ ...@@ -92,6 +93,7 @@
92 this.$emit("input", false); 93 this.$emit("input", false);
93 }, 1000); 94 }, 1000);
94 }); 95 });
96 }
95 }, 97 },
96 /** 98 /**
97 * @description: changeSelectItem 99 * @description: changeSelectItem
......
...@@ -35,7 +35,8 @@ export default { ...@@ -35,7 +35,8 @@ export default {
35 //批量按钮名称 35 //批量按钮名称
36 batchButtonName: '', 36 batchButtonName: '',
37 // 受理申请信息 37 // 受理申请信息
38 slsq: {} 38 slsq: {},
39 dqhj:""
39 } 40 }
40 }, 41 },
41 mounted () { 42 mounted () {
...@@ -57,6 +58,9 @@ export default { ...@@ -57,6 +58,9 @@ export default {
57 stepExpandInfo(formdata).then((res) => { 58 stepExpandInfo(formdata).then((res) => {
58 if (res.code === 200) { 59 if (res.code === 200) {
59 this.leftButtonList = res.result.button; 60 this.leftButtonList = res.result.button;
61 if (res.result.properties&&res.result.properties.length) {
62 this.dqhj = res.result.properties[0].value
63 }
60 this.rightButtonList = res.result.operation; 64 this.rightButtonList = res.result.operation;
61 this.slsq = res.result.slsq 65 this.slsq = res.result.slsq
62 } 66 }
......