Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
88b863bc by renchao@pashanhoo.com
Options

style:登记薄模块功能的完善

1 parent 1ab48d09
Inline Side-by-side
Showing 8 changed files with 61 additions and 65 deletions
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-19 09:30:13 4 * @LastEditTime: 2023-09-19 10:19:52
5 --> 5 -->
6 <template> 6 <template>
7 <transition name="msgbox-fade"> 7 <transition name="msgbox-fade">
...@@ -160,7 +160,6 @@ ...@@ -160,7 +160,6 @@
160 .mask-content { 160 .mask-content {
161 padding: 5px 20px 30px 20px; 161 padding: 5px 20px 30px 20px;
162 width: 100%; 162 width: 100%;
163 min-height: 360px;
164 max-height: 90vh; 163 max-height: 90vh;
165 overflow-y: scroll; 164 overflow-y: scroll;
166 } 165 }
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-18 17:04:46 4 * @LastEditTime: 2023-09-19 10:17:02
5 --> 5 -->
6 <template> 6 <template>
7 <dialogBox title="新建材料信息" width="20%" isMain v-model="myValue" @closeDialog="closeDialog" @submitForm="handleSubmit" 7 <dialogBox title="新建材料信息" width="20%" isMain v-model="myValue" @closeDialog="closeDialog" @submitForm="handleSubmit"
...@@ -24,13 +24,6 @@ ...@@ -24,13 +24,6 @@
24 </el-form-item> 24 </el-form-item>
25 </el-col> 25 </el-col>
26 </el-row> 26 </el-row>
27 <el-row :gutter="20">
28 <el-col :span="24">
29 <el-form-item label="材料编码" prop="clbm">
30 <el-input v-model="ruleForm.clbm"></el-input>
31 </el-form-item>
32 </el-col>
33 </el-row>
34 </el-form> 27 </el-form>
35 </dialogBox> 28 </dialogBox>
36 </template> 29 </template>
...@@ -47,7 +40,6 @@ ...@@ -47,7 +40,6 @@
47 ruleForm: { 40 ruleForm: {
48 cllx: "", 41 cllx: "",
49 clmc: "", 42 clmc: "",
50 clbm: "",
51 sfggcl: "0" 43 sfggcl: "0"
52 }, 44 },
53 rules: { 45 rules: {
...@@ -78,7 +70,6 @@ ...@@ -78,7 +70,6 @@
78 this.ruleForm = { 70 this.ruleForm = {
79 cllx: "", 71 cllx: "",
80 clmc: "", 72 clmc: "",
81 clbm: "",
82 sfggcl: "0" 73 sfggcl: "0"
83 } 74 }
84 }, 75 },
...@@ -93,7 +84,6 @@ ...@@ -93,7 +84,6 @@
93 this.ruleForm = { 84 this.ruleForm = {
94 cllx: "", 85 cllx: "",
95 clmc: "", 86 clmc: "",
96 clbm: "",
97 sfggcl: "0" 87 sfggcl: "0"
98 } 88 }
99 this.$emit("input", false); 89 this.$emit("input", false);
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-19 08:53:58 4 * @LastEditTime: 2023-09-19 10:17:20
5 --> 5 -->
6 <template> 6 <template>
7 <div class="clmlmx-box"> 7 <div class="clmlmx-box">
...@@ -65,15 +65,6 @@ ...@@ -65,15 +65,6 @@
65 } 65 }
66 }, 66 },
67 { 67 {
68 label: "材料编码",
69 render: (h, scope) => {
70 return (
71 (this.formData.ableOperation && scope.row.sfxjcl == '1') ?
72 <el-input value={scope.row.sjbm} onInput={(val) => { scope.row.sjbm = val }}></el-input> : <span>{scope.row.sjbm}</span>
73 )
74 }
75 },
76 {
77 label: "材料类型", 68 label: "材料类型",
78 width: "110", 69 width: "110",
79 render: (h, scope) => { 70 render: (h, scope) => {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-18 17:22:36 4 * @LastEditTime: 2023-09-19 10:15:00
5 --> 5 -->
6 <template> 6 <template>
7 <div class="clxx"> 7 <div class="clxx">
...@@ -261,7 +261,6 @@ ...@@ -261,7 +261,6 @@
261 smzt: "", 261 smzt: "",
262 ys: 0, 262 ys: 0,
263 sjlx: data.cllx, 263 sjlx: data.cllx,
264 sjbm: data.clbm,
265 sfxjcl: "1", // 是否必选 264 sfxjcl: "1", // 是否必选
266 sfggcl: data.sfggcl, 265 sfggcl: data.sfggcl,
267 }; 266 };
...@@ -333,7 +332,7 @@ ...@@ -333,7 +332,7 @@
333 }) 332 })
334 } 333 }
335 } 334 }
336 }; 335 }
337 </script> 336 </script>
338 <style scoped lang="scss"> 337 <style scoped lang="scss">
339 @import "~@/styles/mixin.scss"; 338 @import "~@/styles/mixin.scss";
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-18 08:55:31 4 * @LastEditTime: 2023-09-19 10:15:07
5 --> 5 -->
6 <template> 6 <template>
7 <dialogBox title="新建材料信息" width="20%" isMain v-model="myValue" @closeDialog="closeDialog" @submitForm="handleSubmit" 7 <dialogBox title="新建材料信息" width="25%" isMain v-model="myValue" @closeDialog="closeDialog" @submitForm="handleSubmit"
8 :isFullscreen="false"> 8 :isFullscreen="false">
9 <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px"> 9 <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px">
10 <el-row> 10 <el-row>
...@@ -24,19 +24,17 @@ ...@@ -24,19 +24,17 @@
24 </el-form-item> 24 </el-form-item>
25 </el-col> 25 </el-col>
26 </el-row> 26 </el-row>
27 <el-row :gutter="20"> 27 <el-row :gutter="20">
28 <el-col :span="24"> 28 <el-col :span="24">
29 <el-form-item 29 <el-form-item
30 label="是否公共材料" 30 label="是否公共材料">
31 > 31 <el-radio-group
32 <el-radio-group 32 v-model="ruleForm.sfggcl">
33 v-model="ruleForm.sfggcl" 33 <el-radio label="1">是</el-radio>
34 > 34 <el-radio label="0">否</el-radio>
35 <el-radio label="1">是</el-radio> 35 </el-radio-group>
36 <el-radio label="0">否</el-radio> 36 </el-form-item>
37 </el-radio-group> 37 </el-col>
38 </el-form-item>
39 </el-col>
40 </el-row> 38 </el-row>
41 </el-form> 39 </el-form>
42 </dialogBox> 40 </dialogBox>
...@@ -54,7 +52,7 @@ ...@@ -54,7 +52,7 @@
54 ruleForm: { 52 ruleForm: {
55 cllx: "", 53 cllx: "",
56 clmc: "", 54 clmc: "",
57 sfggcl:"0" 55 sfggcl: "0"
58 }, 56 },
59 rules: { 57 rules: {
60 cllx: [ 58 cllx: [
...@@ -62,6 +60,9 @@ ...@@ -62,6 +60,9 @@
62 ], 60 ],
63 clmc: [ 61 clmc: [
64 { required: true, message: '请输入材料名称', trigger: 'blur' } 62 { required: true, message: '请输入材料名称', trigger: 'blur' }
63 ],
64 clbm: [
65 { required: true, message: '请输入材料编码', trigger: 'blur' }
65 ] 66 ]
66 } 67 }
67 } 68 }
...@@ -84,6 +85,7 @@ ...@@ -84,6 +85,7 @@
84 this.ruleForm = { 85 this.ruleForm = {
85 cllx: "", 86 cllx: "",
86 clmc: "", 87 clmc: "",
88 sfggcl: "0"
87 } 89 }
88 }, 90 },
89 /** 91 /**
...@@ -97,7 +99,7 @@ ...@@ -97,7 +99,7 @@
97 this.ruleForm = { 99 this.ruleForm = {
98 cllx: "", 100 cllx: "",
99 clmc: "", 101 clmc: "",
100 sfggcl:"0" 102 sfggcl: "0"
101 } 103 }
102 this.$emit("input", false); 104 this.$emit("input", false);
103 } else { 105 } else {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-18 17:21:36 4 * @LastEditTime: 2023-09-19 10:14:56
5 --> 5 -->
6 <template> 6 <template>
7 <div class="clmlmx-box"> 7 <div class="clmlmx-box">
...@@ -64,15 +64,6 @@ ...@@ -64,15 +64,6 @@
64 } 64 }
65 }, 65 },
66 { 66 {
67 label: "材料编码",
68 render: (h, scope) => {
69 return (
70 (this.formData.ableOperation && scope.row.sfxjcl == '1') ?
71 <el-input value={scope.row.sjbm} onInput={(val) => { scope.row.sjbm = val }}></el-input> : <span>{scope.row.sjbm}</span>
72 )
73 }
74 },
75 {
76 label: "材料类型", 67 label: "材料类型",
77 width: "110", 68 width: "110",
78 render: (h, scope) => { 69 render: (h, scope) => {
...@@ -266,6 +257,18 @@ ...@@ -266,6 +257,18 @@
266 this.tableData.splice(evt.newIndex, 0, targetRow); 257 this.tableData.splice(evt.newIndex, 0, targetRow);
267 } 258 }
268 }) 259 })
260 },
261 dicStatus (val, code) {
262 let data = store.getters.dictData[code],
263 name = '暂无'
264 if (data) {
265 data.map((item) => {
266 if (item.dcode == val) {
267 name = item.dname
268 }
269 })
270 return name
271 }
269 } 272 }
270 } 273 }
271 } 274 }
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-18 11:15:30 4 * @LastEditTime: 2023-09-19 10:04:58
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -159,7 +159,7 @@ ...@@ -159,7 +159,7 @@
159 class="loadingtext" 159 class="loadingtext"
160 @sort-change="handleSort" 160 @sort-change="handleSort"
161 :current-page.sync="pageData.currentPage" 161 :current-page.sync="pageData.currentPage"
162 :heightNum="305" 162 :heightNum="350"
163 :total="tableData.total" 163 :total="tableData.total"
164 @size-change="handleSizeChange" 164 @size-change="handleSizeChange"
165 @p-current-change="handleCurrentChange" 165 @p-current-change="handleCurrentChange"
...@@ -256,12 +256,11 @@ ...@@ -256,12 +256,11 @@
256 this.queryClick(); 256 this.queryClick();
257 }, 257 },
258 /** 258 /**
259 * @description: ywhClick 259 * @description: 有任务权限
260 * @param {*} item 260 * @param {*} item
261 * @author: renchao 261 * @author: renchao
262 */ 262 */
263 ywhClick (item) { 263 ywhClick (item) {
264 //有任务权限
265 if (item.sjlx == "3") { 264 if (item.sjlx == "3") {
266 item.djywbm = "DJBBL"; 265 item.djywbm = "DJBBL";
267 const { href } = this.$router.resolve( 266 const { href } = this.$router.resolve(
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-18 11:19:07 4 * @LastEditTime: 2023-09-19 10:04:04
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
43 <el-col :span="4" class="btnColRight"> 43 <el-col :span="4" class="btnColRight">
44 <el-form-item> 44 <el-form-item>
45 <el-button type="primary" native-type="submit" @click="handleSearch">查询</el-button> 45 <el-button type="primary" native-type="submit" @click="handleSearch">查询</el-button>
46 <el-button @click="moreQueryClick">高级查询</el-button> 46 <!-- <el-button @click="moreQueryClick">高级查询</el-button> -->
47 </el-form-item> 47 </el-form-item>
48 </el-col> 48 </el-col>
49 </el-row> 49 </el-row>
...@@ -140,18 +140,31 @@ ...@@ -140,18 +140,31 @@
140 console.log(name, sort); 140 console.log(name, sort);
141 }, 141 },
142 /** 142 /**
143 * @description: 高级查询
144 * @author: renchao
145 */
146 moreQueryClick () { },
147 /**
148 * @description: openDialog 143 * @description: openDialog
149 * @param {*} item 144 * @param {*} item
150 * @author: renchao 145 * @author: renchao
151 */ 146 */
152 openDialog (item) { 147 openDialog (item) {
153 const { href } = this.$router.resolve('/workFrameView?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + item.bsmBusiness + '&type=jdcx') 148 if (item.sjlx == "3") {
154 window.open(href, `urlname${item.bsmSlsq}`) 149 item.djywbm = "DJBBL";
150 const { href } = this.$router.resolve(
151 "/djbworkFrameview?bsmSlsq=" +
152 item.bsmSlsq +
153 "&bestepid=" +
154 item.bestepid +
155 "&sqywbm=" +
156 item.djywbm
157 );
158 window.open(href, `djbworkFrameview${item.bsmSlsq}`);
159 } else {
160 const { href } = this.$router.resolve(
161 "/workFrameView?bsmSlsq=" +
162 item.bsmSlsq +
163 "&bestepid=" +
164 item.bestepid
165 );
166 window.open(href, `workFrameView${item.bsmSlsq}`);
167 }
155 } 168 }
156 } 169 }
157 } 170 }
......