e0ff8a24 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents ebc4fdf7 dc1e6b80
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2024-03-07 09:13:26 4 * @LastEditTime: 2024-03-13 09:33:38
5 */ 5 */
6 import Vue from 'vue' 6 import Vue from 'vue'
7 import { getPrintTemplateByCode, getPrintAcceptance, getPrintReceiveSupplementalMaterials, getPrintRejectForms, getPrintSendBackMaterials, getPrintRiviseForms } from "@/api/print"; 7 import { getPrintTemplateByCode, getPrintAcceptance, getPrintReceiveSupplementalMaterials, getPrintRejectForms, getPrintSendBackMaterials, getPrintRiviseForms } from "@/api/print";
...@@ -142,6 +142,7 @@ export default { ...@@ -142,6 +142,7 @@ export default {
142 { bsmSlsq: this.$route.query.bsmSlsq }, '70%', true 142 { bsmSlsq: this.$route.query.bsmSlsq }, '70%', true
143 ) 143 )
144 break; 144 break;
145 // B8 可编辑 house 不可编辑
145 case "B8": 146 case "B8":
146 !window.djlx && getZrzbsmList(this.bsmSlsq).then((res) => { 147 !window.djlx && getZrzbsmList(this.bsmSlsq).then((res) => {
147 if (res.code === 200) { 148 if (res.code === 200) {
...@@ -169,6 +170,36 @@ export default { ...@@ -169,6 +170,36 @@ export default {
169 djlx: window.djlx 170 djlx: window.djlx
170 }, '85%', true, false) 171 }, '85%', true, false)
171 break; 172 break;
173 case "house":
174 !window.djlx && getZrzbsmList(this.bsmSlsq).then((res) => {
175 if (res.code === 200) {
176 ywPopupDialog('楼盘表', 'lpb/index', {
177 bsm: res.result[0],
178 onlyShow: false,
179 unitData: window.unitData,
180 bsmSlsq: this.bsmSlsq,
181 onlyShow: true,
182 showSave: true,
183 djlx: window.djlx,
184 isworkFrame: true
185 }, '85%', true, false)
186 } else {
187 this.$message.error(res.message)
188 }
189 })
190 .catch((err) => {
191 this.$message.error(err)
192 });
193 window.djlx && ywPopupDialog('楼盘表', 'lpb/zjgcdy', {
194 onlyShow: false,
195 unitData: window.unitData,
196 onlyShow: true,
197 bsmSlsq: this.bsmSlsq,
198 showSave: true,
199 djlx: window.djlx
200 }, '85%', true, false)
201 break;
202 break;
172 // 图形定位 203 // 图形定位
173 case "B-TXDW": 204 case "B-TXDW":
174 getZdInfo(this.currentSelectProps.bdcdyid).then(res => { 205 getZdInfo(this.currentSelectProps.bdcdyid).then(res => {
...@@ -256,7 +287,7 @@ export default { ...@@ -256,7 +287,7 @@ export default {
256 let key = index + 1 287 let key = index + 1
257 this.$set(infoRes.result, "file" + key, it.sjmc) 288 this.$set(infoRes.result, "file" + key, it.sjmc)
258 this.$set(infoRes.result, "file" + key + 'ys', it.ys) 289 this.$set(infoRes.result, "file" + key + 'ys', it.ys)
259 this.$set(infoRes.result, "file" + key + 'lx', it.sjlx==1?"原件":"复印件") 290 this.$set(infoRes.result, "file" + key + 'lx', it.sjlx == 1 ? "原件" : "复印件")
260 }) 291 })
261 } 292 }
262 infoRes.result.nownian = this.newDate.split(' ')[0].split('年')[0] 293 infoRes.result.nownian = this.newDate.split(' ')[0].split('年')[0]
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
44 :data="tableData.data"> 44 :data="tableData.data">
45 </lb-table> 45 </lb-table>
46 </div> 46 </div>
47 <div class="submit_button" style="text-align:center"> 47 <div class="submit_button" style="text-align:center" v-if="!sqywInfo.onlyShow">
48 <el-button @click="close">取消</el-button> 48 <el-button @click="close">取消</el-button>
49 <el-button type="primary" plain @click="submitForm" :loading="loading" v-if="sqywInfo.isworkFrame">添加单元</el-button> 49 <el-button type="primary" plain @click="submitForm" :loading="loading" v-if="sqywInfo.isworkFrame">添加单元</el-button>
50 <el-button type="primary" plain @click="submitForm" :loading="loading" v-else>发起申请</el-button> 50 <el-button type="primary" plain @click="submitForm" :loading="loading" v-else>发起申请</el-button>
......