Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
310a586d by xiaomiao
Options

--no commit message

1 parent a144e2a0
Inline Side-by-side
Showing 13 changed files with 193 additions and 193 deletions
...@@ -128,3 +128,15 @@ export function getZtQlxx (params) { ...@@ -128,3 +128,15 @@ export function getZtQlxx (params) {
128 data 128 data
129 }) 129 })
130 } 130 }
131 /**
132 * @description: 添加审核意见
133 * @param {*} data
134 * @author: renchao
135 */
136 export function addidea (data) {
137 return request({
138 url: SERVER.SERVERAPI + '/rest/djbRepair/sh',
139 method: 'post',
140 data
141 })
142 }
......
...@@ -302,7 +302,7 @@ ...@@ -302,7 +302,7 @@
302 </el-form-item> 302 </el-form-item>
303 </el-col> 303 </el-col>
304 </div> 304 </div>
305 <el-row class="btn"> 305 <el-row class="btn" v-if="!$route.query.viewtype">
306 <el-form-item> 306 <el-form-item>
307 <el-button type="primary" @click="onSubmit">保存</el-button> 307 <el-button type="primary" @click="onSubmit">保存</el-button>
308 </el-form-item> 308 </el-form-item>
......
...@@ -471,7 +471,7 @@ ...@@ -471,7 +471,7 @@
471 /> 471 />
472 </div> 472 </div>
473 </div> 473 </div>
474 <el-row class="btn"> 474 <el-row class="btn" v-if="!$route.query.viewtype">
475 <el-form-item> 475 <el-form-item>
476 <el-button type="primary" @click="onSubmit">保存</el-button> 476 <el-button type="primary" @click="onSubmit">保存</el-button>
477 </el-form-item> 477 </el-form-item>
......
...@@ -253,7 +253,7 @@ ...@@ -253,7 +253,7 @@
253 /> 253 />
254 </div> 254 </div>
255 </div> 255 </div>
256 <el-row class="btn"> 256 <el-row class="btn" v-if="!$route.query.viewtype">
257 <el-form-item> 257 <el-form-item>
258 <el-button type="primary" @click="onSubmit">保存</el-button> 258 <el-button type="primary" @click="onSubmit">保存</el-button>
259 </el-form-item> 259 </el-form-item>
......
...@@ -328,7 +328,7 @@ ...@@ -328,7 +328,7 @@
328 /> 328 />
329 </div> 329 </div>
330 </div> 330 </div>
331 <el-row class="btn"> 331 <el-row class="btn" v-if="!$route.query.viewtype">
332 <el-form-item> 332 <el-form-item>
333 <el-button type="primary" @click="onSubmit">保存</el-button> 333 <el-button type="primary" @click="onSubmit">保存</el-button>
334 </el-form-item> 334 </el-form-item>
...@@ -429,6 +429,7 @@ export default { ...@@ -429,6 +429,7 @@ export default {
429 mounted() {}, 429 mounted() {},
430 methods: { 430 methods: {
431 loadData() { 431 loadData() {
432
432 this.propsParam.isEdit=this.$parent.isEdit 433 this.propsParam.isEdit=this.$parent.isEdit
433 init(this.propsParam).then((res) => { 434 init(this.propsParam).then((res) => {
434 if (res.code == 200) { 435 if (res.code == 200) {
......
...@@ -273,7 +273,7 @@ ...@@ -273,7 +273,7 @@
273 /> 273 />
274 </div> 274 </div>
275 </div> 275 </div>
276 <el-row class="btn" v-if="!$route.query.viewtype && ableOperation"> 276 <el-row class="btn" v-if="!$route.query.viewtype">
277 <el-form-item> 277 <el-form-item>
278 <el-button type="primary" @click="onSubmit">保存</el-button> 278 <el-button type="primary" @click="onSubmit">保存</el-button>
279 </el-form-item> 279 </el-form-item>
...@@ -375,6 +375,7 @@ export default { ...@@ -375,6 +375,7 @@ export default {
375 return store.getters.dictData[val]; 375 return store.getters.dictData[val];
376 }, 376 },
377 loadData() { 377 loadData() {
378
378 this.propsParam.isEdit = this.$parent.isEdit; 379 this.propsParam.isEdit = this.$parent.isEdit;
379 init(this.propsParam).then((res) => { 380 init(this.propsParam).then((res) => {
380 if (res.code == 200) { 381 if (res.code == 200) {
......
...@@ -292,7 +292,7 @@ ...@@ -292,7 +292,7 @@
292 /> 292 />
293 </div> 293 </div>
294 </div> 294 </div>
295 <el-row class="btn"> 295 <el-row class="btn" v-if="!$route.query.viewtype">
296 <el-form-item> 296 <el-form-item>
297 <el-button type="primary" @click="onSubmit">保存</el-button> 297 <el-button type="primary" @click="onSubmit">保存</el-button>
298 </el-form-item> 298 </el-form-item>
......
...@@ -203,8 +203,7 @@ ...@@ -203,8 +203,7 @@
203 /> 203 />
204 </div> 204 </div>
205 </div> 205 </div>
206 <!-- <el-row class="btn" v-if="!$route.query.viewtype && ableOperation"> --> 206 <el-row class="btn" v-if="!$route.query.viewtype">
207 <el-row class="btn">
208 <el-form-item> 207 <el-form-item>
209 <el-button type="primary" @click="onSubmit">保存</el-button> 208 <el-button type="primary" @click="onSubmit">保存</el-button>
210 </el-form-item> 209 </el-form-item>
......
...@@ -4,230 +4,213 @@ ...@@ -4,230 +4,213 @@
4 * @LastEditTime: 2023-05-17 10:41:24 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 <b class="spyj_title">审批表</b>
10 <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px"> 10 <el-form
11 <div class="spyj_form" v-for="(item, index) in tableData" :key="index"> 11 :model="ruleForm"
12 <div class="item_left"> 12 :rules="rules"
13 {{ item.jdmc }}意见 13 ref="rule"
14 </div> 14 label-width="120px"
15 >
16 <div class="spyj_form">
17 <div class="item_left">意见</div>
15 <div class="item_right"> 18 <div class="item_right">
16 <el-row> 19 <el-row>
17 <el-col :span="24"> 20 <el-col :span="24">
18 <el-form-item label-width="0" class="opinion_item" prop="shyj"> 21 <el-form-item label-width="0" class="opinion_item" prop="shyj">
19 <el-input type="textarea" :rows="4" class="opinion" placeholder="请输入审批意见" 22 <el-input
20 v-if="item.stepShjy == '1' && ableOperation" v-model="ruleForm.shyj"></el-input> 23 type="textarea"
21 <el-input type="textarea" :rows="4" class="opinion" v-model="item.shyj" v-else :disabled="true"> 24 :rows="4"
22 </el-input> 25 class="opinion"
23 <el-button class="opinion_btn" @click="commonOpinion" 26 placeholder="请输入审批意见"
24 v-if="item.stepShjy == '1' && ableOperation">常用意见</el-button> 27 v-model="ruleForm.shyj"
28 ></el-input>
25 </el-form-item> 29 </el-form-item>
26 </el-col> 30 </el-col>
27 </el-row> 31 </el-row>
28 <el-row> 32 <el-row>
29 <el-col :span="16"> 33 <el-col :span="16">
30 <el-form-item label="审查人" prop="shryxm"> 34 <el-form-item label="审查人" prop="shryxm">
31 {{ item.shryxm }} 35 <el-input v-model="ruleForm.shryxm"></el-input>
32 </el-form-item> 36 </el-form-item>
33 </el-col> 37 </el-col>
34 <el-col :span="8"> 38 <el-col :span="8">
35 <el-form-item label="审核时间" prop="shjssj" :key="refresh"> 39 <el-form-item label="审核时间" prop="shjssj" :key="refresh">
36 {{ item.shjssj }} 40 <el-date-picker
41 v-model="ruleForm.shsj"
42 type="date"
43 placeholder="选择日期"
44 value-format="yyyy/MM/dd HH:mm:ss"
45 format="yyyy/MM/dd"
46 >
47 </el-date-picker>
37 </el-form-item> 48 </el-form-item>
38 </el-col> 49 </el-col>
39 </el-row> 50 </el-row>
40 </div> 51 </div>
41 </div> 52 </div>
42 <div class="submit_button" v-if="ableOperation"> 53 <div class="submit_button" v-if="!$route.query.viewtype">
43 <el-button type="primary" @click="onSubmit">保存</el-button> 54 <el-button type="primary" @click="onSubmit">保存</el-button>
44 </div> 55 </div>
45 </el-form> 56 </el-form>
46 </div> 57 </div>
47 <el-empty v-if="isNoData" description="暂无数据"></el-empty> 58 <!-- <el-empty v-if="isNoData" description="暂无数据"></el-empty> -->
48 </div> 59 </div>
49 </template> 60 </template>
50 <script> 61 <script>
51 import { getSpyjList, saveSpyj, saveSpyjBySlsq } from "@/api/fqsq.js"; 62 import { addidea } from "@/api/djbbl.js";
52 import { mapGetters } from 'vuex' 63 import { mapGetters } from "vuex";
53 export default { 64 export default {
54 computed: { 65 computed: {
55 ...mapGetters(['userData', 'yjsqOptions']) 66 ...mapGetters(["userData", "yjsqOptions"]),
56 }, 67 },
57 data () { 68 data() {
58 return { 69 return {
59 isNoData: false, 70 isNoData: false,
60 bsmSlsq: '', 71 //刷新值
61 //刷新值 72 refresh: 10,
62 refresh: 10, 73 ableOperation: true,
63 ableOperation: true, 74 ruleForm: {
64 bsmSlsq: this.$route.query.bsmSlsq,
65 bestepid: this.$route.query.bestepid,
66 ruleForm: {},
67 rules: {
68 shyj: [
69 { required: true, message: '请输入审批意见', trigger: 'blur' }
70 ],
71 },
72 tableData: [],
73 propsParam: {}
74 }
75 },
76 watch: {
77 yjsqOptions: {
78 handler (val) {
79 this.ruleForm.shyj = val
80 },
81 deep: true,
82 immediate: true
83 }, 75 },
84 }, 76 rules: {
85 mounted () { 77 shyj: [{ required: true, message: "请输入审批意见", trigger: "blur" }],
86 this.propsParam = this.$attrs;
87 if (this.$route.query.viewtype) {
88 this.ableOperation = false
89 }
90 this.list();
91 },
92 methods: {
93 //审批意见数据初始化
94 list () {
95 let that = this
96 this.$startLoading()
97 var formdata = new FormData();
98 formdata.append("bsmBusiness", this.propsParam.bsmRepair);
99 formdata.append("bestepid", this.$route.query.bestepid);
100 formdata.append("ableOperation", this.ableOperation)
101 getSpyjList(formdata).then((res) => {
102 this.$endLoading()
103 if (res.code === 200 && res.result) {
104 console.log("this.tableData this.tableData this.tableData ",this.tableData );
105 this.tableData = res.result ? res.result : []
106 console.log("this.tableDatathis.tableDatathis.tableDatathis.tableData",this.tableData);
107 if (res.result.length == 0) {
108 that.isNoData = true
109 }
110 this.ruleForm = res.result[res.result.length - 1]
111 }
112 })
113 },
114 onSubmit () {
115 this.ruleForm.bsmSlsq = this.bsmSlsq
116 this.ruleForm.bestepid = this.bestepid
117 saveSpyjBySlsq(this.ruleForm).then(res => {
118 if (res.code === 200) {
119 this.$message.success("保存成功")
120 this.refresh += 1
121 } else {
122 this.$message.error(res.message)
123 }
124 })
125 },
126 //打开常用意见列表弹窗
127 commonOpinion () {
128 this.$popupDialog("常用意见", "djbworkflow/components/dialog/commonOpinion", {}, "70%", true)
129 }, 78 },
130 //使用常用意见 79 tableData: [1],
131 useOpinion (opinion) { 80 };
132 this.ruleForm.shyj = opinion 81 },
133 } 82
134 } 83 watch: {
135 } 84
85 },
86 created() {
87 },
88 mounted() {
89 },
90 methods: {
91 onSubmit() {
92 this.ruleForm.bsmBusiness =this.$parent.bsmRepair;
93 this.ruleForm.jdmc = "审核";
94 addidea(this.ruleForm).then((res) => {
95 if (res.code === 200) {
96 this.$message.success("保存成功");
97 this.refresh += 1;
98 } else {
99 this.$message.error(res.message);
100 }
101 });
102 },
103 //打开常用意见列表弹窗
104 // commonOpinion() {
105 // this.$popupDialog(
106 // "常用意见",
107 // "djbworkflow/components/dialog/commonOpinion",
108 // {},
109 // "70%",
110 // true
111 // );
112 // },
113 // //使用常用意见
114 // useOpinion(opinion) {
115 // this.ruleForm.shyj = opinion;
116 // },
117 },
118 };
136 </script> 119 </script>
137 <style scoped lang='scss'> 120 <style scoped lang="scss">
138 @import "~@/styles/mixin.scss"; 121 @import "~@/styles/mixin.scss";
139 122
140 .spyj { 123 .spyj {
124 width: 100%;
125 height: 100%;
126 background-color: #f5f5f5;
127 padding: 5px;
128 .box {
129 overflow-x: auto;
141 width: 100%; 130 width: 100%;
142 height: 100%; 131 height: 95%;
143 background-color: #f5f5f5; 132 background: #fff;
144 padding: 5px; 133 text-align: center;
145 .box { 134 padding: 4px;
146 overflow-x: auto; 135 overflow-y: scroll;
147 width: 100%; 136 padding-top: 20px;
148 height: 95%; 137 padding: 20px 40px;
149 background: #fff; 138 }
150 text-align: center; 139 .spyj_title {
151 padding: 4px; 140 line-height: 68px;
152 overflow-y: scroll; 141 border: 1px solid $borderColor;
153 padding-top: 20px; 142 text-align: center;
154 padding: 20px 40px; 143 font-size: 22px;
155 } 144 font-weight: 400;
156 .spyj_title { 145 background-color: #eceef2;
157 line-height: 68px; 146 display: block;
158 border: 1px solid $borderColor; 147 border-bottom: none;
159 text-align: center; 148 }
160 font-size: 22px;
161 font-weight: 400;
162 background-color: #eceef2;
163 display: block;
164 border-bottom: none;
165 }
166 149
167 /deep/.el-form-item { 150 /deep/.el-form-item {
168 margin-bottom: 0; 151 margin-bottom: 0;
169 } 152 }
170 153
171 .bottom10 { 154 .bottom10 {
172 margin-bottom: 15px; 155 margin-bottom: 15px;
173 } 156 }
157
158 .spyj_form {
159 display: flex;
160 border: 1px solid $borderColor;
174 161
175 .spyj_form { 162 .item_left {
163 width: 150px;
164 background-color: #f8f8fa;
165 color: #606266;
176 display: flex; 166 display: flex;
177 border: 1px solid $borderColor; 167 font-size: 14px;
168 text-indent: 80px;
169 align-items: center;
170 border-right: 1px solid $borderColor;
171 }
172
173 .item_right {
174 flex: 1;
175 width: 100%;
178 176
179 .item_left { 177 /deep/.el-form-item__label {
180 width: 150px;
181 background-color: #f8f8fa; 178 background-color: #f8f8fa;
182 color: #606266;
183 display: flex;
184 font-size: 14px;
185 text-indent: 80px;
186 align-items: center;
187 border-right: 1px solid $borderColor;
188 } 179 }
189 180 /deep/.el-form-item__content {
190 .item_right { 181 display: block;
191 flex: 1; 182 text-align: left;
192 width: 100%; 183 text-indent: 10px;
193 184 }
194 /deep/.el-form-item__label { 185 .opinion_item {
195 background-color: #f8f8fa; 186 /deep/.el-form-item__error {
196 } 187 margin-top: -16px !important;
197 /deep/.el-form-item__content { 188 left: 3px;
198 display: block;
199 text-align: left;
200 text-indent: 10px;
201 } 189 }
202 .opinion_item {
203 /deep/.el-form-item__error {
204 margin-top: -16px !important;
205 left: 3px;
206 }
207 190
208 border-bottom: 1px solid $borderColor; 191 border-bottom: 1px solid $borderColor;
209 } 192 }
210 193
211 .opinion { 194 .opinion {
212 position: relative; 195 position: relative;
213 font-size: 14px; 196 font-size: 14px;
214 197
215 /deep/.el-textarea__inner { 198 /deep/.el-textarea__inner {
216 border: none; 199 border: none;
217 }
218 } 200 }
201 }
219 202
220 .opinion_btn { 203 .opinion_btn {
221 position: absolute; 204 position: absolute;
222 right: 15px; 205 right: 15px;
223 bottom: 10px; 206 bottom: 10px;
224 }
225 } 207 }
226 } 208 }
209 }
227 210
228 .submit_button { 211 .submit_button {
229 text-align: center; 212 text-align: center;
230 margin: 15px 0; 213 margin: 15px 0;
231 }
232 } 214 }
215 }
233 </style> 216 </style>
......
...@@ -127,6 +127,7 @@ export default { ...@@ -127,6 +127,7 @@ export default {
127 treedata: {}, 127 treedata: {},
128 tabdata: [], 128 tabdata: [],
129 defaultNode: {}, 129 defaultNode: {},
130 bsmRepair:""
130 }; 131 };
131 }, 132 },
132 mounted() { 133 mounted() {
...@@ -166,6 +167,9 @@ export default { ...@@ -166,6 +167,9 @@ export default {
166 }, 167 },
167 // 获取右侧选项卡 168 // 获取右侧选项卡
168 getCurrentSelectProps(val) { 169 getCurrentSelectProps(val) {
170 if(val.bsmRepair){
171 this.bsmRepair=val.bsmRepair
172 }
169 if (val.bdcdyid) { 173 if (val.bdcdyid) {
170 this.oneSelectProps = val; 174 this.oneSelectProps = val;
171 } 175 }
...@@ -215,11 +219,9 @@ export default { ...@@ -215,11 +219,9 @@ export default {
215 }, 219 },
216 //切换选项卡内容组件 220 //切换选项卡内容组件
217 getFromRouter(tabname) { 221 getFromRouter(tabname) {
218 console.log("切换选项卡内容组件", tabname,this.tabList);
219 this.componentTag = getForm(tabname); 222 this.componentTag = getForm(tabname);
220 }, 223 },
221 closefp() { 224 closefp() {
222 console.log("点击分屏");
223 this.splitScreen = this.splitScreen ? false : true; 225 this.splitScreen = this.splitScreen ? false : true;
224 this.$store.dispatch("app/set1tScreen", this.splitScreen); 226 this.$store.dispatch("app/set1tScreen", this.splitScreen);
225 this.getFromRouter(this.tabList[0].value); 227 this.getFromRouter(this.tabList[0].value);
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-05 09:55:42 4 * @LastEditTime: 2023-07-05 09:55:42
5 --> 5 -->
...@@ -67,9 +67,11 @@ ...@@ -67,9 +67,11 @@
67 ...mapGetters(["dictData"]) 67 ...mapGetters(["dictData"])
68 }, 68 },
69 created () { 69 created () {
70 this.ableOperation = this.$parent?.currentSelectTab?.ableOperation || false
71 this.clmlInitList(1) 70 this.clmlInitList(1)
72 }, 71 },
72 mounted() {
73 this.ableOperation = this.$parent.isEdit;
74 },
73 methods: { 75 methods: {
74 // 自动预览 76 // 自动预览
75 nextPriview () { 77 nextPriview () {
...@@ -125,7 +127,6 @@ ...@@ -125,7 +127,6 @@
125 this.previewImg.bsmSj = item.bsmSj; 127 this.previewImg.bsmSj = item.bsmSj;
126 }, 128 },
127 updateList (val) { 129 updateList (val) {
128 console.log(val, 'valvalvalval');
129 let that = this 130 let that = this
130 if (val.children.length != []) { //删除最后一张图片时 val=null 131 if (val.children.length != []) { //删除最后一张图片时 val=null
131 this.tableData.forEach(item => { 132 this.tableData.forEach(item => {
...@@ -339,4 +340,4 @@ ...@@ -339,4 +340,4 @@
339 } 340 }
340 } 341 }
341 } 342 }
342 </style>
...\ No newline at end of file ...\ No newline at end of file
343 </style>
......
...@@ -83,6 +83,7 @@ ...@@ -83,6 +83,7 @@
83 }, 83 },
84 }, 84 },
85 mounted () { 85 mounted () {
86 this.propsParam.isEdit=this.$parent.isEdit
86 this.propsParam = this.$attrs; 87 this.propsParam = this.$attrs;
87 if (this.$route.query.viewtype) { 88 if (this.$route.query.viewtype) {
88 this.ableOperation = false 89 this.ableOperation = false
......
...@@ -198,9 +198,9 @@ ...@@ -198,9 +198,9 @@
198 "/djbworkFrameview?bsmSlsq=" + 198 "/djbworkFrameview?bsmSlsq=" +
199 item.bsmSlsq + 199 item.bsmSlsq +
200 "&bestepid=" + 200 "&bestepid=" +
201 item.bestepid + 201 item.bestepid+
202 "&isEdit=" + 202 "&bsmBusiness=" +
203 true 203 "&viewtype=1"
204 ); 204 );
205 window.open(href, `urlname${item.bsmSlsq}`); 205 window.open(href, `urlname${item.bsmSlsq}`);
206 } else { 206 } else {
......