1d6b5418 by renchao@pashanhoo.com

style:材料信息

1 parent 3edaaf1d
1 /* 1 /*
2 * @Description: 材料信息 2 * @Description: 材料信息
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-13 15:39:37 4 * @LastEditTime: 2023-09-13 15:56:03
5 */ 5 */
6 import request from '@/utils/request' 6 import request from '@/utils/request'
7 let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl')) 7 let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
...@@ -49,9 +49,9 @@ export function saveClml (data) { ...@@ -49,9 +49,9 @@ export function saveClml (data) {
49 * @param {*} data 49 * @param {*} data
50 * @author: renchao 50 * @author: renchao
51 */ 51 */
52 export function updateClml (data, bsmSldy) { 52 export function updateClml (data, bsmSldy, bsmSlsq) {
53 return request({ 53 return request({
54 url: SERVER.SERVERAPI + '/rest/ywbl/clxx/updateClml/' + bsmSldy, 54 url: SERVER.SERVERAPI + '/rest/ywbl/clxx/updateClml/' + bsmSldy + '/' + bsmSlsq,
55 method: 'post', 55 method: 'post',
56 data 56 data
57 }) 57 })
......
1 /* 1 /*
2 * @Description: 企业银行接口 2 * @Description: 企业银行接口
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-12 08:35:25 4 * @LastEditTime: 2023-09-13 17:08:10
5 */ 5 */
6 import request from '@/utils/request' 6 import request from '@/utils/request'
7 let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl')) 7 let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
...@@ -11,7 +11,6 @@ let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('Ap ...@@ -11,7 +11,6 @@ let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('Ap
11 * @description: 获取材料目录 11 * @description: 获取材料目录
12 * @author: renchao 12 * @author: renchao
13 */ 13 */
14
15 export function getCompanyMaterialList (bsmCompany) { 14 export function getCompanyMaterialList (bsmCompany) {
16 return request({ 15 return request({
17 url: SERVER.SERVERAPI + '/rest/sys/company/getCompanyMaterialList', 16 url: SERVER.SERVERAPI + '/rest/sys/company/getCompanyMaterialList',
...@@ -97,4 +96,16 @@ export function move (bsmFile, direction) { ...@@ -97,4 +96,16 @@ export function move (bsmFile, direction) {
97 direction: direction 96 direction: direction
98 } 97 }
99 }) 98 })
99 }
100 /**
101 * @description: 编辑材料目录
102 * @param {*} data
103 * @author: renchao
104 */
105 export function editCompanyMaterialList (data, bsmCompany) {
106 return request({
107 url: SERVER.SERVERAPI + '/rest/sys/company/editCompanyMaterialList/' + bsmCompany,
108 method: 'post',
109 data
110 })
100 } 111 }
...\ No newline at end of file ...\ No newline at end of file
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-13 13:48:47 4 * @LastEditTime: 2023-09-13 15:58:06
5 --> 5 -->
6 <template> 6 <template>
7 <div class="clmlmx-box"> 7 <div class="clmlmx-box">
...@@ -182,7 +182,7 @@ ...@@ -182,7 +182,7 @@
182 handleSubmit () { 182 handleSubmit () {
183 this.loading = true 183 this.loading = true
184 store.dispatch('user/reWorkFresh', false) 184 store.dispatch('user/reWorkFresh', false)
185 updateClml(this.tableData, this.formData.bsmSldy).then(res => { 185 updateClml(this.tableData, this.formData.bsmSldy, Vue.prototype.$currentRoute.query.bsmSlsq).then(res => {
186 this.loading = false 186 this.loading = false
187 if (res.code == 200) { 187 if (res.code == 200) {
188 this.$message({ 188 this.$message({
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-18 14:26:54 4 * @LastEditTime: 2023-09-13 16:16:08
5 --> 5 -->
6 <template> 6 <template>
7 <canvas id="mxcad"> 7 <div>
8 </canvas> 8 <canvas id="mxcad" style="width:100%;height:100%">
9 </canvas>
10 </div>
9 </template> 11 </template>
10 <script> 12 <script>
11 import Mx from "mxdraw" 13 import Mx from "mxdraw"
...@@ -31,7 +33,7 @@ ...@@ -31,7 +33,7 @@
31 console.log(listLayer) 33 console.log(listLayer)
32 }) 34 })
33 }, 35 },
34 isNewFile: true // 是否新建文件 36 isNewFile: false // 是否新建文件
35 }) 37 })
36 }) 38 })
37 } 39 }
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-13 13:46:03 4 * @LastEditTime: 2023-09-13 17:08:53
5 --> 5 -->
6 <template> 6 <template>
7 <div class="clmlmx-box"> 7 <div class="clmlmx-box">
...@@ -15,10 +15,10 @@ ...@@ -15,10 +15,10 @@
15 </div> 15 </div>
16 </template> 16 </template>
17 <script> 17 <script>
18 import Vue from 'vue'
19 import store from '@/store/index.js' 18 import store from '@/store/index.js'
19 import Sortable from 'sortablejs'
20 import { ywPopupCacel } from "@/utils/popup.js"; 20 import { ywPopupCacel } from "@/utils/popup.js";
21 import { InitClml, updateClml, deleteSjClml, moveClml } from "@/api/clxx.js"; 21 import { editCompanyMaterialList } from "@/api/company.js";
22 export default { 22 export default {
23 props: { 23 props: {
24 formData: { 24 formData: {
...@@ -58,7 +58,8 @@ ...@@ -58,7 +58,8 @@
58 label: "材料名称", 58 label: "材料名称",
59 render: (h, scope) => { 59 render: (h, scope) => {
60 return ( 60 return (
61 <el-input value={scope.row.clmc} onInput={(val) => { scope.row.clmc = val }}></el-input> 61 (scope.row.sfxjcl == '1') ?
62 <el-input value={scope.row.clmc} onInput={(val) => { scope.row.clmc = val }}></el-input> : <span>{scope.row.clmc}</span>
62 ) 63 )
63 } 64 }
64 }, 65 },
...@@ -81,24 +82,6 @@ ...@@ -81,24 +82,6 @@
81 } 82 }
82 }, 83 },
83 { 84 {
84 label: "份数",
85 width: "50",
86 render: (h, scope) => {
87 return (
88 <el-input value={scope.row.sjsl} onInput={(val) => { scope.row.sjsl = val }}></el-input>
89 )
90 }
91 },
92 {
93 label: "扫描时间",
94 width: "140",
95 render: (h, scope) => {
96 return (
97 <span>{scope.row.sjsj}</span>
98 )
99 }
100 },
101 {
102 label: "页数", 85 label: "页数",
103 width: "80", 86 width: "80",
104 render: (h, scope) => { 87 render: (h, scope) => {
...@@ -157,6 +140,8 @@ ...@@ -157,6 +140,8 @@
157 }, 140 },
158 mounted () { 141 mounted () {
159 this.initSort() 142 this.initSort()
143 this.tableData = _.cloneDeep(this.formData.data)
144 console.log(this.formData.bsmCompany);
160 }, 145 },
161 beforeDestroy () { 146 beforeDestroy () {
162 if (this.sortable) { 147 if (this.sortable) {
...@@ -176,26 +161,17 @@ ...@@ -176,26 +161,17 @@
176 handleCancel () { 161 handleCancel () {
177 ywPopupCacel() 162 ywPopupCacel()
178 }, 163 },
179 handleAdd () {
180 this.tableData.push({
181 clmc: '',
182 cllx: '1',
183 sjsl: '',
184 smzt: '',
185 count: 0
186 })
187 },
188 handleSubmit () { 164 handleSubmit () {
189 this.loading = true 165 this.loading = true
190 store.dispatch('user/reWorkFresh', false) 166 store.dispatch('user/reWorkFresh', false)
191 updateClml(this.tableData).then(res => { 167 editCompanyMaterialList(this.tableData, this.formData.bsmCompany).then(res => {
192 this.loading = false 168 this.loading = false
193 if (res.code == 200) { 169 if (res.code == 200) {
194 this.$message({ 170 this.$message({
195 message: '保存成功', 171 message: '保存成功',
196 type: 'success' 172 type: 'success'
197 }) 173 })
198 this.$popupCacel() 174 ywPopupCacel()
199 store.dispatch('user/reWorkFresh', true) 175 store.dispatch('user/reWorkFresh', true)
200 } 176 }
201 }).catch(() => { 177 }).catch(() => {
...@@ -203,29 +179,6 @@ ...@@ -203,29 +179,6 @@
203 }) 179 })
204 }, 180 },
205 /** 181 /**
206 * @description: 材料目录明细初始化
207 * @author: renchao
208 */
209 clmlInitList () {
210 return new Promise(resolve => {
211 this.unitData = this.$parent.unitData;
212 var formdata = new FormData();
213 formdata.append("bsmSlsq", Vue.prototype.$currentRoute.query.bsmSlsq);
214 InitClml(formdata).then((res) => {
215 if (res.code == 200) {
216 resolve(res.code)
217 if (res.result && res.result.length > 0) {
218 this.tableData = res.result;
219 } else {
220 this.tableData = []
221 }
222 } else {
223 this.$message.error(res.message)
224 }
225 })
226 })
227 },
228 /**
229 * @description: 材料目录删除 182 * @description: 材料目录删除
230 * @param {*} index 183 * @param {*} index
231 * @param {*} row 184 * @param {*} row
...@@ -238,17 +191,7 @@ ...@@ -238,17 +191,7 @@
238 cancelButtonText: '取消', 191 cancelButtonText: '取消',
239 type: 'warning' 192 type: 'warning'
240 }).then(() => { 193 }).then(() => {
241 deleteSjClml({ sjBsm: row.bsmSj }).then(async (res) => { 194 this.tableData.splice(index, 1);
242 if (res.code == 200) {
243 let res = await that.clmlInitList()
244 if (res == 200) {
245 that.$message({
246 message: "删除成功",
247 type: "success"
248 })
249 }
250 }
251 })
252 }).catch(() => { 195 }).catch(() => {
253 this.$message({ 196 this.$message({
254 type: 'info', 197 type: 'info',
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-11 13:52:42 4 * @LastEditTime: 2023-09-13 17:05:49
5 --> 5 -->
6 <template> 6 <template>
7 <div class="clxx"> 7 <div class="clxx">
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
91 } 91 }
92 }, 92 },
93 created () { 93 created () {
94 this.clmlInitList(); 94 this.clmlInitList()
95 }, 95 },
96 methods: { 96 methods: {
97 /** 97 /**
...@@ -274,6 +274,7 @@ ...@@ -274,6 +274,7 @@
274 store.dispatch("user/reWorkFresh", false); 274 store.dispatch("user/reWorkFresh", false);
275 ywPopupDialog("申请材料目录", "xxba/components/clxx/dialog/clxxDetailDialog", { 275 ywPopupDialog("申请材料目录", "xxba/components/clxx/dialog/clxxDetailDialog", {
276 data: this.tableData, 276 data: this.tableData,
277 bsmCompany: this.formData.bsmCompany
277 }, "60%", true, false) 278 }, "60%", true, false)
278 }, 279 },
279 //设置tableData 280 //设置tableData
......