Skip to content

bdc / bdcdj-web

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

Merge branch 'dev'

2 parents 0e768cf8 e98c6adb
Expand all
Inline Side-by-side
Showing 32 changed files with 662 additions and 168 deletions
/*
* @Description: 材料信息
* @Autor: renchao
* @LastEditTime: 2023-09-13 15:56:03
* @LastEditTime: 2023-09-18 16:03:16
*/
import request from '@/utils/request'
let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
......@@ -157,3 +157,17 @@ export function getClmxList (bsmSj) {
}
})
}
/**
* @description: 补录材料目录
* @param {*} data
* @author: renchao
*/
export function repairInitClml (data) {
return request({
url: SERVER.SERVERAPI + '/rest/ywbl/clxx/repairInitClml',
method: 'post',
params: {
repair: data.bsmRepair
}
})
}
\ No newline at end of file
......
......@@ -28,7 +28,7 @@ export function getXtParamsByYwh (ywh) {
*/
export function getBlParamsByYwh (ywh, bsmQlxx) {
return request({
url: SERVER.SERVERAPI + '​/rest​/ywbl​/djyw​/getBlParamsByYwh',
url: SERVER.SERVERAPI + '/rest/ywbl/djyw/getBlParamsByYwh',
method: 'get',
params: {
ywh: ywh,
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-14 17:11:15
* @LastEditTime: 2023-09-19 10:19:52
-->
<template>
<transition name="msgbox-fade">
......@@ -160,7 +160,6 @@
.mask-content {
padding: 5px 20px 30px 20px;
width: 100%;
min-height: 253px;
max-height: 90vh;
overflow-y: scroll;
}
......
<!-- 这是补录的业务流程模块 -->
\ No newline at end of file
这是登记薄材料明细
补录数据和临时数据
\ No newline at end of file
<!-- 这是补录信息的材料文件 -->
\ No newline at end of file
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-07 15:04:46
* @LastEditTime: 2023-09-19 10:17:02
-->
<template>
<dialogBox title="新建材料信息" width="20%" isMain v-model="myValue" @closeDialog="closeDialog" @submitForm="handleSubmit"
......@@ -40,6 +40,7 @@
ruleForm: {
cllx: "",
clmc: "",
sfggcl: "0"
},
rules: {
cllx: [
......@@ -47,14 +48,17 @@
],
clmc: [
{ required: true, message: '请输入材料名称', trigger: 'blur' }
],
clbm: [
{ required: true, message: '请输入材料编码', trigger: 'blur' }
]
}
}
},
watch: {
value (val) {
this.myValue = val;
},
this.myValue = val
}
},
methods: {
/**
......@@ -66,6 +70,7 @@
this.ruleForm = {
cllx: "",
clmc: "",
sfggcl: "0"
}
},
/**
......@@ -79,6 +84,7 @@
this.ruleForm = {
cllx: "",
clmc: "",
sfggcl: "0"
}
this.$emit("input", false);
} else {
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-14 11:14:54
* @LastEditTime: 2023-09-19 10:17:20
-->
<template>
<div class="clmlmx-box">
<lb-table :column="column" :key="key" row-key="bsmMaterial" ref="listTable" :heightNumSetting="true" :calcHeight="500" :pagination="false"
:data="tableData">
<lb-table :column="column" :key="key" row-key="bsmSj" ref="listTable" :heightNumSetting="true" :calcHeight="600"
:pagination="false" :data="tableData">
</lb-table>
<div class="text-center">
<el-button @click="handleCancel">取消</el-button>
<el-button type="primary" @click="handleSubmit" :loading="loading">保存</el-button>
<el-button @click="$popupCacel">取消</el-button>
<el-button type="primary" @click="handleSubmit" v-if="formData.ableOperation && tableData.length>0" :loading="loading">保存</el-button>
</div>
</div>
</template>
<script>
import store from '@/store/index.js'
import Vue from 'vue'
import Sortable from 'sortablejs'
import store from '@/store/index.js'
import { ywPopupCacel } from "@/utils/popup.js";
import { editCompanyMaterialList } from "@/api/company.js";
import { InitClml, updateClml } from "@/api/clxx.js";
export default {
props: {
formData: {
......@@ -34,11 +35,32 @@
sortable: null,
column: [
{
prop: "isrequired",
label: "是否必选",
width: "80",
render: (h, scope) => {
if (scope.row.isrequired === "1") {
return (
<div>
<span>必选</span>
</div>
);
}
else {
return (
<div>
<span>可选</span>
</div>
)
}
}
},
{
label: "材料名称",
render: (h, scope) => {
return (
(scope.row.sfxjcl == '1') ?
<el-input value={scope.row.clmc} onInput={(val) => { scope.row.clmc = val }}></el-input> : <span>{scope.row.clmc}</span>
(this.formData.ableOperation && scope.row.sfxjcl == '1') ?
<el-input value={scope.row.sjmc} onInput={(val) => { scope.row.sjmc = val }}></el-input> : <span>{scope.row.sjmc}</span>
)
}
},
......@@ -47,27 +69,50 @@
width: "110",
render: (h, scope) => {
return (
<el-select value={scope.row.cllx}
onChange={(val) => { scope.row.cllx = val }}>
{
store.getters.dictData['A40'].map(option => {
return (
<el-option label={option.dname} value={option.dcode}></el-option>
)
})
}
</el-select>
this.formData.ableOperation ?
<el-select value={scope.row.sjlx}
onChange={(val) => { scope.row.sjlx = val }}>
{
store.getters.dictData['A40'].map(option => {
return (
<el-option label={option.dname} value={option.dcode}></el-option>
)
})
}
</el-select> : <span>{this.dicStatus(scope.row.sjlx, "A40")}</span>
)
}
},
{
label: "页数",
prop: "sjsl",
label: "收件数量",
width: "80",
render: (h, scope) => {
if (scope.row.count && scope.row.count > 0) {
return (
(this.formData.ableOperation) ?
<el-input value={scope.row.sjsl} onInput={(val) => { scope.row.sjsl = val }}></el-input> : <span>{
scope.row.sjsl
}</span>
)
}
},
{
label: "扫描时间",
width: "140",
render: (h, scope) => {
return (
<span>{scope.row.sjsj}</span>
)
}
},
{
label: "页数",
width: "60",
render: (h, scope) => {
if (scope.row.ys && scope.row.ys > 0) {
return (
<div>
<span>{scope.row.count}</span>
<span>{scope.row.ys}</span>
</div>
);
} else {
......@@ -80,6 +125,21 @@
},
},
{
label: "是否新建材料",
width: "80",
render: (h, scope) => {
if (scope.row.sfxjcl && scope.row.sfxjcl == '1') {
return (
<span>是</span>
);
} else {
return (
<span>否</span>
);
}
},
},
{
label: "操作",
width: "100",
render: (h, scope) => {
......@@ -87,7 +147,7 @@
<el-button
type="text"
icon="el-icon-delete"
disabled={scope.row.count != 0}
disabled={!(scope.row.ys == 0 && scope.row.sfxjcl == '1') || !this.formData.ableOperation}
onClick={() => {
this.handleDelete(scope.$index, scope.row);
}}
......@@ -102,15 +162,6 @@
tableData: []
}
},
mounted () {
this.initSort()
this.tableData = _.cloneDeep(this.formData.data)
},
beforeDestroy () {
if (this.sortable) {
this.sortable.destroy();
}
},
watch: {
'formData.data': {
handler: function (val, oldVal) {
......@@ -120,32 +171,61 @@
deep: true
}
},
mounted () {
this.initSort()
},
beforeDestroy () {
if (this.sortable) {
this.sortable.destroy();
}
},
methods: {
handleCancel () {
ywPopupCacel()
},
handleSubmit () {
this.loading = true
store.dispatch('user/reWorkFresh', false)
editCompanyMaterialList(this.tableData, this.formData.bsmCompany).then(res => {
updateClml(this.tableData, this.formData.bsmSldy, Vue.prototype.$currentRoute.query.bsmSlsq).then(res => {
this.loading = false
if (res.code == 200) {
this.$message({
message: '保存成功',
type: 'success'
})
store.dispatch('user/reWorkFresh', true)
ywPopupCacel()
store.dispatch('user/reWorkFresh', true)
}
}).catch(() => {
this.loading = false
})
},
/**
* @description: 材料目录明细初始化
* @author: renchao
*/
clmlInitList () {
return new Promise(resolve => {
this.unitData = this.$parent.unitData;
var formdata = new FormData();
formdata.append("bsmSlsq", Vue.prototype.$currentRoute.query.bsmSlsq);
formdata.append("bsmSldy", this.formData.bsmRepair);
formdata.append("clfl", 3);
InitClml(formdata).then((res) => {
if (res.code == 200) {
resolve(res.code)
if (res.result && res.result.length > 0) {
this.tableData = res.result;
} else {
this.tableData = []
}
} else {
this.$message.error(res.message)
}
})
})
},
/**
* @description: 材料目录删除
* @param {*} index
* @param {*} row
* @author: renchao
*/
handleDelete (index, row) {
this.$confirm('此操作将永久删除该 是否继续?', '提示', {
......@@ -173,7 +253,19 @@
this.tableData.splice(evt.newIndex, 0, targetRow);
}
})
}
},
dicStatus (val, code) {
let data = store.getters.dictData[code],
name = '暂无'
if (data) {
data.map((item) => {
if (item.dcode == val) {
name = item.dname
}
})
return name
}
},
}
}
</script>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-14 16:24:07
* @LastEditTime: 2023-09-18 17:11:37
-->
<template>
<div class="rlPopup">
......@@ -14,7 +14,7 @@
<div class="img-list-wrap" v-Loading="loading">
<img src="http://127.0.0.1:38088/video=stream&camidx=0" v-if="isScan" alt="高拍仪">
<div v-for="(img, i) in previewImg.imgList" :key="i" v-else>
<photo-zoom :url="img.fileurl" :bigWidth="165" v-if="i === previewImg.index" :scale="2"
<photo-zoom :url="img.fjurl" :bigWidth="165" v-if="i === previewImg.index" :scale="2"
overlayStyle="width: 100%;height:100%">
</photo-zoom>
</div>
......@@ -41,7 +41,7 @@
<ul>
<li v-for="(img, index) in thumbnailImages" :key="index" :class="{ active: previewImg.index === index }"
@click="showCurrent(index)">
<img :src="img.fileurl">
<img :src="img.fjurl">
</li>
</ul>
</div>
......@@ -53,7 +53,7 @@
<script>
import PhotoZoom from '@/components/PhotoZoom'
import { getAltimeterInfo, getUuid } from '@/utils/operation.js'
import { uploadBatch, deleteFile, move } from "@/api/company.js"
import { uploadBatch, deleteClmx, move } from "@/api/clxx.js";
import publicPicture from '@/components/publicPicture/index.vue'
export default {
name: 'PreviewImage',
......@@ -86,7 +86,7 @@
// 缩略图
thumbnailImages: [],
showViewer: false,
initialIndex: 0,
initialIndex: undefined,
allLi: [],
}
},
......@@ -94,7 +94,7 @@
previewImg: {
handler (newValue, oldValue) {
if (newValue.imgList && newValue.imgList.length > 0) {
this.allLi = _.cloneDeep(newValue.imgList).map(item => item.fileurl)
this.allLi = _.cloneDeep(newValue.imgList).map(item => item.fjurl)
this.thumbnailImages = newValue.imgList
} else {
this.allLi = []
......@@ -134,18 +134,14 @@
setTimeout(() => {
this.scanTitle = '关闭高拍仪'
this.loading = false
}, 3000)
}, 4000)
} else {
this.scanTitle = '打开高拍仪'
}
},
/**
* @description: 左右移动
* @param {*} direction
* @author: renchao
*/
// 左右移动
handleMove (direction) {
move(this.previewImg.imgList[this.previewImg.index].bsmFile, direction).then(res => {
move(direction, this.previewImg.imgList[this.previewImg.index].bsmClmx).then(res => {
if (res.code == 200) {
if (direction == 'left') {
this.previewImg.index = this.previewImg.index - 1
......@@ -153,7 +149,7 @@
this.previewImg.index = this.previewImg.index + 1
}
this.initialIndex = this.previewImg.index
this.$emit('updateList', { children: res.result, bsmMaterial: this.previewImg.bsmMaterial })
this.$emit('updateList', { children: res.result, bsmSj: this.previewImg.bsmSj })
this.$message({
message: '移动成功!',
type: 'success'
......@@ -195,7 +191,7 @@
let file = blobToFile(blob);
var formData = new FormData();
formData.append('file', file)
formData.append("bsmMaterial ", this.previewImg.bsmMaterial);
formData.append("bsmSj", this.previewImg.bsmSj);
formData.append("bsmSlsq", this.previewImg.bsmSlsq);
uploadSjClmx(formData).then((res) => {
if (res.code == 200) {
......@@ -292,13 +288,14 @@
this.key++
return;
}
formData.append("bsmMaterial", this.previewImg.bsmMaterial);
formData.append("bsmSj", this.previewImg.bsmSj);
formData.append("bsmSlsq", this.previewImg.bsmSlsq);
if (this.previewImg.imgList.length > 0) {
formData.append("index", this.previewImg.imgList[this.previewImg.index].sxh);
}
uploadBatch(formData).then((res) => {
if (res.code == 200) {
this.$emit('updateList', { children: res.result, bsmMaterial: this.previewImg.bsmMaterial })
this.$emit('updateList', { children: res.result, bsmSj: this.previewImg.bsmSj })
this.$message({
message: '上传成功!',
type: 'success'
......@@ -320,12 +317,12 @@
cancelButtonText: '取消',
type: 'warning'
}).then(async () => {
let bsmFile = this.previewImg.imgList[this.previewImg.index].bsmFile
let bsmMaterial = this.previewImg.imgList[this.previewImg.index].bsmMaterial
this.previewImg.imgList = this.previewImg.imgList.filter(item => item.bsmFile != bsmFile)
deleteFile(bsmFile).then(res => {
let bsmClmx = this.previewImg.imgList[this.previewImg.index].bsmClmx
let bsmSj = this.previewImg.imgList[this.previewImg.index].bsmSj
this.previewImg.imgList = this.previewImg.imgList.filter(item => item.bsmClmx != bsmClmx)
deleteClmx(bsmClmx).then(res => {
if (res.code == 200) {
that.$emit('updateList', { children: this.previewImg.imgList, bsmMaterial: bsmMaterial })
that.$emit('updateList', { children: this.previewImg.imgList, bsmSj: bsmSj })
that.$message({
message: '删除成功!',
type: 'success'
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-15 10:09:10
* @LastEditTime: 2023-09-19 09:28:13
-->
<template>
<div class="clxx">
......@@ -29,12 +29,12 @@
</div>
<div
v-for="(item, index) in tableData"
:key="item.bsmMaterial"
:class="['child', treeCheckId == item.bsmMaterial ? 'checked' : '']"
:key="item.bsmSj"
:class="['child', treeCheckId == item.bsmSj ? 'checked' : '']"
@click="treeClick(item, index)">
{{ item.clmc }}
<span class="cl_number" :key="key" v-if="item.count">({{ item.count }})</span>
<span class="cl_number" :key="key" v-else>(0)</span>
<span v-if="item.isrequired == 1" class="required">必选</span>
{{ item.sjmc }}
<span class="cl_number" :key="key">({{ item.ys ? item.ys : 0 }})</span>
</div>
</div>
</div>
......@@ -62,9 +62,7 @@
import imagePreview from "./dialog/imagePreview.vue";
import clxxAddDialog from "./dialog/clxxAddDialog.vue";
import clxxDetailDialog from "./dialog/clxxDetailDialog.vue";
import { getCompanyMaterialList, addCompanyMaterial, getFileListByBsmMaterial } from "@/api/company.js";
import { saveClml, getClmxList } from "@/api/clxx.js";
import { repairInitClml } from "@/api/djbRepair.js";
import { repairInitClml, saveClml, getClmxList } from "@/api/clxx.js";
export default {
components: { clxxAddDialog, imagePreview, clxxDetailDialog },
props: {
......@@ -85,7 +83,7 @@
key: 0,
tableData: [],
previewImg: {
bsmMaterial: "",
bsmSj: "",
index: 0,
selectedIndex: 0,
imgList: []
......@@ -100,7 +98,7 @@
watch: {
workFresh: {
handler (newValue, oldValue) {
this.clmlInitList()
if (newValue) this.clmlInitList()
},
deep: true,
immediate: true
......@@ -118,19 +116,19 @@
if (this.treeCheckIndex < this.tableData.length) {
this.treeCheckIndex++;
if (this.tableData[this.treeCheckIndex]) {
this.treeCheckId = this.tableData[this.treeCheckIndex].bsmMaterial;
this.treeCheckId = this.tableData[this.treeCheckIndex].bsmSj;
// 判断页数
let ys = this.tableData[this.treeCheckIndex].ys
this.previewImg.index = 0;
// 获取材料明细
if (ys > 0) {
getFileListByBsmMaterial(this.treeCheckId).then(res => {
getClmxList(this.treeCheckId).then(res => {
this.previewImg.imgList = res.result ? res.result : []
})
} else {
this.previewImg.imgList = []
}
this.previewImg.bsmMaterial = this.tableData[this.treeCheckIndex].bsmMaterial;
this.previewImg.bsmSj = this.tableData[this.treeCheckIndex].bsmSj;
} else {
this.$message.error('没有最后一张了');
}
......@@ -143,11 +141,11 @@
prevPriview () {
if (this.treeCheckIndex >= 1) {
this.treeCheckIndex--;
this.treeCheckId = this.tableData[this.treeCheckIndex].bsmMaterial;
this.treeCheckId = this.tableData[this.treeCheckIndex].bsmSj;
// 判断页数
let ys = this.tableData[this.treeCheckIndex].ys
if (ys > 0) {
getFileListByBsmMaterial(this.treeCheckId).then(res => {
getClmxList(this.treeCheckId).then(res => {
this.previewImg.imgList = res.result ? res.result : []
this.previewImg.index = this.previewImg.imgList.length - 1;
})
......@@ -155,7 +153,7 @@
this.previewImg.imgList = [];
this.previewImg.index = 0
}
this.previewImg.bsmMaterial = this.tableData[this.treeCheckIndex].bsmMaterial;
this.previewImg.bsmSj = this.tableData[this.treeCheckIndex].bsmSj;
} else {
this.$message.error('没有第一张了');
}
......@@ -168,7 +166,7 @@
clmlInitList (type) {
// 1：列表初始化 2：新增材料
return new Promise((resolve) => {
getCompanyMaterialList(this.formData.bsmCompany).then((res) => {
repairInitClml(this.$parent).then((res) => {
if (res.code == 200) {
resolve(res.code);
if (res.result && res.result.length > 0) {
......@@ -195,12 +193,12 @@
* @author: renchao
*/
setChecked (item) {
this.treeCheckId = item.bsmMaterial;
this.treeCheckId = item.bsmSj;
this.title = item.sjmc;
this.titleYs = 1;
this.titleNum = item.children.length;
this.previewImg.imgList = item.children;
this.previewImg.bsmMaterial = item.bsmMaterial;
this.previewImg.bsmSj = item.bsmSj;
},
/**
* @description: updateList
......@@ -212,7 +210,7 @@
if (val.children.length != 0) {
//删除最后一张图片时 val=null
this.tableData.forEach((item) => {
if (item.bsmMaterial == val.bsmMaterial) {
if (item.bsmSj == val.bsmSj) {
item.count = val.children.length
}
});
......@@ -224,7 +222,7 @@
} else {
this.previewImg.imgList = [];
this.tableData.forEach((item, index) => {
if (this.treeCheckId == item.bsmMaterial) {
if (this.treeCheckId == item.bsmSj) {
item.count = 0;
that.treeCheckIndex = index;
}
......@@ -245,20 +243,34 @@
*/
addSave (data) {
let obj = {
bsmCompany: this.formData.bsmCompany,
clmc: data.clmc,
cllx: data.cllx
bsmSlsq: this.$parent.bsmSlsq,
isrequired: "1",
sjmc: data.clmc,
sjsl: 0,
smzt: "",
ys: 0,
sjlx: data.cllx,
sjbm: data.clbm,
sfxjcl: "1", // 是否必选
sfggcl: data.sfggcl,
};
addCompanyMaterial(obj).then(async (res) => {
//是否公共材料
if (data.sfggcl == "0") {
obj["bsmSldy"] = this.$parent.currentSelectProps.bsmSldy;
}
if (this.$route.query.sqywbm == "DJBBL") {
obj.bsmSldy = this.$parent.bsmRepair
}
saveClml(obj).then(async (res) => {
if (res.code == 200) {
let res = await this.clmlInitList(2);
if (res == 200)
this.$message({
message: "新增成功",
type: "success"
})
type: "success",
});
}
})
});
},
/**
* @description: 材料目录点击选中
......@@ -268,12 +280,12 @@
*/
treeClick (item, index) {
this.previewImg.index = 0;
this.treeCheckId = item?.bsmMaterial;
this.treeCheckId = item?.bsmSj;
this.treeCheckIndex = index;
getFileListByBsmMaterial(item.bsmMaterial).then(res => {
getClmxList(item.bsmSj).then(res => {
this.previewImg.imgList = res.result ? res.result : []
})
this.previewImg.bsmMaterial = item?.bsmMaterial;
this.previewImg.bsmSj = item?.bsmSj;
},
/**
* @description: 小图片点击
......@@ -288,9 +300,8 @@
//查看明细
viewDetail () {
store.dispatch("user/reWorkFresh", false);
ywPopupDialog("申请材料目录", "xxba/components/clxx/dialog/clxxDetailDialog", {
ywPopupDialog("申请材料目录", "djbworkflow/components/clxx/dialog/clxxDetailDialog", {
data: this.tableData,
bsmCompany: this.formData.bsmCompany
}, "60%", true, false)
},
//设置tableData
......@@ -401,6 +412,7 @@
line-height: 20px;
transition: all 0.3s;
padding: 8px 0;
overflow: hidden;
}
.child:hover {
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-15 09:31:37
* @LastEditTime: 2023-09-18 16:32:42
*/
//流程环节操作按钮
export function getForm (tabName) {
......@@ -82,7 +82,7 @@ export function getForm (tabName) {
form = require("@/views/djbworkflow/djbBook/components/blxxtabs/cfdj.vue");
break;
case "clxx":
form = require("@/views/djbworkflow/djbBook/components/clxx/index.vue");
form = require("@/views/djbworkflow/components/clxx/index.vue");
break;
case "spyj":
form = require("@/views/djbworkflow/djbBook/spyj.vue");
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-19 09:55:41
-->
<template>
<div class="rlPopup">
<div class="prev handle-btn" v-if="!isScan" @click="prev()">
<i class="el-icon-arrow-left"></i>
</div>
<div class="next handle-btn" v-if="!isScan" @click="next()">
<i class="el-icon-arrow-right"></i>
</div>
<div class="img-list-wrap" v-Loading="loading">
<img src="http://127.0.0.1:38088/video=stream&camidx=0" v-if="isScan" alt="">
<div v-for="(img, i) in previewImg.imgList" :key="i" v-else>
<photo-zoom :url="img.fjurl" :bigWidth="165" v-if="i === previewImg.index" :scale="2"
overlayStyle="width: 100%;height:100%">
</photo-zoom>
</div>
</div>
<!--缩略图-->
<div class="thumb-wrap">
<div class="thumb-wrap-button">
<el-button type="primary" @click="clickImage" v-if="previewImg.imgList.length>0">（放大） 显示（缩小）</el-button>
<!-- <el-upload class="fileUpdate" ref="upload" :key="key" action="" :show-file-list="false" :multiple="true" :auto-upload="false"
:on-change="handleChange"
accept=".JPG, .PNG, .JPEG,.jpg, .png, .jpeg">
<el-button icon="el-icon-upload" type="primary" v-if="ableOperation">上传</el-button>
</el-upload> -->
<!-- <el-button type="primary" @click="handleMove('left')" v-if="ableOperation">左移</el-button>
<el-button type="primary" @click="handleMove('right')" v-if="ableOperation">右移</el-button> -->
<!-- <el-button type="primary" icon="el-icon-delete-solid" @click="handleDelete"
v-if="thumbnailImages.length>0 && ableOperation">删除</el-button>
<div v-if="ableOperation" class="pl-5">
<el-button type="primary" @click="handleOpenScan" v-if="ableOperation" :loading="loading">{{scanTitle}}</el-button>
<el-button type="primary" @click="handleViewScan" v-if="isScan && ableOperation">拍照</el-button>
</div> -->
</div>
<ul>
<li v-for="(img, index) in thumbnailImages" :key="index" :class="{ active: previewImg.index === index }"
@click="showCurrent(index)">
<img :src="img.fjurl">
</li>
</ul>
</div>
<!-- 点开后的视图 -->
<publicPicture v-if="showViewer" :url-list="allLi" :initialIndex="initialIndex" @close-viewer="closeViewer">
</publicPicture>
</div>
</template>
<script>
import PhotoZoom from '@/components/PhotoZoom'
import publicPicture from '@/components/publicPicture/index.vue'
export default {
name: 'PreviewImage',
props: {
previewImg: {
type: Object,
default: () => { }
},
ableOperation: {
type: Boolean,
default: true
}
},
components: {
PhotoZoom,
publicPicture
},
data () {
return {
loading: false,
key: 0,
isScan: false,
// 打开高拍仪
scanTitle: '打开高拍仪',
transform: {
scale: 1,
degree: 0
},
maxFileLength: 0,
// 缩略图
thumbnailImages: [],
showViewer: false,
initialIndex: 0,
allLi: [],
}
},
watch: {
previewImg: {
handler (newValue, oldValue) {
if (newValue.imgList && newValue.imgList.length > 0) {
this.allLi = _.cloneDeep(newValue.imgList).map(item => item.fjurl)
this.thumbnailImages = newValue.imgList
} else {
this.allLi = []
this.thumbnailImages = []
}
},
deep: true,
immediate: true
}
},
created () {
this.maxLength = 0;
this.allLi = _.cloneDeep(this.previewImg.imgList).map(item => item.fjurl)
this.thumbnailImages = this.previewImg.imgList
},
computed: {
isFirst () {
return this.previewImg.index === 0
},
isLast () {
return this.previewImg.index === this.previewImg.imgList.length - 1
}
},
methods: {
prev () {
let len = this.previewImg.imgList.length
if (this.isFirst || len == 0) {
this.$emit('prevPriview')
} else {
this.$parent.previewImg.index = (this.$parent.previewImg.index - 1 + len) % len
}
},
/**
* @description: next
* @author: renchao
*/
next () {
let len = this.previewImg.imgList.length
if (this.isLast || len == 0) {
this.$emit('nextPriview')
} else {
this.$parent.previewImg.index = (this.$parent.previewImg.index + 1) % len
}
},
/**
* @description: showCurrent
* @param {*} index
* @author: renchao
*/
showCurrent (index) {
this.previewImg.index = index
this.initialIndex = index
},
/**
* @description: closeViewer
* @author: renchao
*/
closeViewer () {
this.showViewer = false
},
/**
* @description: clickImage
* @author: renchao
*/
clickImage () {
this.showViewer = true
}
}
}
</script>
<style lang="scss" scoped>
// 查看大图
.rlPopup {
position: relative;
width: 100%;
text-align: center;
height: 100%;
.handle-btn {
position: absolute;
top: 50%;
transform: translateY(-100%);
width: 66px;
height: 66px;
line-height: 75px;
color: #fff;
background-color: rgb(239, 239, 239);
border-radius: 50%;
cursor: pointer;
text-align: center;
transition: all 0.3s;
i {
font-size: 24px;
}
}
.handle-btn:hover {
background-color: rgb(185, 183, 183);
}
.prev {
left: 1%;
}
.next {
right: 5%;
}
.img-list-wrap {
width: calc(100% - 30px);
display: flex;
justify-content: center;
height: calc(100% - 150px);
align-items: center;
background: rgba(194, 190, 190, 0.1);
overflow: scroll;
img {
display: block;
object-fit: scale-down;
transition: all 0.3s;
max-width: 100%;
}
}
.thumb-wrap {
&-button {
display: flex;
justify-content: center;
.fileUpdate {
margin: 0 10px;
}
}
li {
float: left;
width: 60px;
height: 45px;
border: solid 1px #ececec;
position: relative;
margin-right: 5px;
cursor: pointer;
&:last-child {
margin-right: 0;
}
img {
max-width: 57px;
max-height: 42px;
display: block;
object-fit: scale-down;
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
}
}
.active {
border-color: #409eff;
}
}
}
</style>
<style>
.zoom-on-hover {
position: relative;
overflow: hidden;
}
.zoom-on-hover .normal {
width: 100%;
}
.zoom-on-hover .zoom {
position: absolute;
opacity: 0;
transform-origin: top left;
}
.zoom-on-hover.zoomed .zoom {
opacity: 1;
}
.zoom-on-hover.zoomed .normal {
opacity: 0;
}
</style>
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-18 14:42:14
* @LastEditTime: 2023-09-19 09:12:32
-->
<template>
<div class="tableBox">
......@@ -97,6 +97,7 @@
<script>
import Router from '@/router'
import { datas } from "../qlxxFormData.js";
import { ywPopupDialog } from "@/utils/popup.js";
import printTemplate from "../components/printTemplate.vue";
import { getXtParamsByYwh, getBlParamsByYwh } from '@/api/djyw'
export default {
......@@ -234,8 +235,7 @@
} else {
getBlParamsByYwh(ywh, bsmQlxx).then(res => {
let data = res.result
const { href } = Router.resolve('/workFrameView?bsmSlsq=' + data.bsmSlsq + '&bestepid=' + data.bestepid + '&bsmBusiness=' + data.bsmBusiness + '&type=jdcx')
window.open(href, `urlname${data.bsmSlsq}`)
ywPopupDialog("材料信息", "registerBook/components/clxx/index", data, "60%", true, false)
})
}
}
......
/*
* @Description:
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-15 10:52:40
*/
......@@ -89,12 +89,12 @@ export function getNode (qllx, qlxx, bdcdylx, bdcdyid) {
if (qlxxPage[i].qllx == qllx) {
if (qllx == "A04" || qllx == "A06" || qllx == "A08") {
if (bdcdylx == "4") {
node = { bdcdyid: bdcdyid, id: "fdcq1", form: "fdcq1.vue", label: qlxxPage[i].label + "(临:" + qlxx.linShi + "，现:" + qlxx.xianShi + "，历:" + qlxx.liShi + ")" };
node = { bdcdyid: bdcdyid, id: "fdcq1", form: "fdcq1.vue", label: qlxxPage[i].label ,zt: "(临:" + qlxx.linShi + "，现:" + qlxx.xianShi + "，历:" + qlxx.liShi + ")" };
} else {
node = { bdcdyid: bdcdyid, id: "fdcq2", form: "fdcq2.vue", label: qlxxPage[i].label + "(临:" + qlxx.linShi + "，现:" + qlxx.xianShi + "，历:" + qlxx.liShi + ")" };
node = { bdcdyid: bdcdyid, id: "fdcq2", form: "fdcq2.vue", label: qlxxPage[i].label ,zt: "(临:" + qlxx.linShi + "，现:" + qlxx.xianShi + "，历:" + qlxx.liShi + ")" };
}
} else {
node = { bdcdyid: bdcdyid, id: qlxxPage[i].id, form: qlxxPage[i].form, label: qlxxPage[i].label + "(临:" + qlxx.linShi + "，现:" + qlxx.xianShi + "，历:" + qlxx.liShi + ")" };
node = { bdcdyid: bdcdyid, id: qlxxPage[i].id, form: qlxxPage[i].form, label: qlxxPage[i].label ,zt: "(临:" + qlxx.linShi + "，现:" + qlxx.xianShi + "，历:" + qlxx.liShi + ")" };
}
break;
}
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-15 10:02:12
* @LastEditTime: 2023-09-19 10:15:00
-->
<template>
<div class="clxx">
......@@ -167,7 +167,6 @@
//type 1：列表初始化 2：新增材料
return new Promise((resolve) => {
this.unitData = this.$parent.unitData;
console.log(this.$parent.unitData, 'this.$parent.unitData;');
var formdata = new FormData();
formdata.append("bsmSlsq", this.$parent.bsmSlsq);
if (this.$route.query.sqywbm == "DJBBL") {
......@@ -333,7 +332,7 @@
})
}
}
};
}
</script>
<style scoped lang="scss">
@import "~@/styles/mixin.scss";
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-18 08:55:31
* @LastEditTime: 2023-09-19 10:15:07
-->
<template>
<dialogBox title="新建材料信息" width="20%" isMain v-model="myValue" @closeDialog="closeDialog" @submitForm="handleSubmit"
<dialogBox title="新建材料信息" width="25%" isMain v-model="myValue" @closeDialog="closeDialog" @submitForm="handleSubmit"
:isFullscreen="false">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px">
<el-row>
......@@ -24,19 +24,17 @@
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-row :gutter="20">
<el-col :span="24">
<el-form-item
label="是否公共材料"
>
<el-radio-group
v-model="ruleForm.sfggcl"
>
<el-radio label="1">是</el-radio>
<el-radio label="0">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-form-item
label="是否公共材料">
<el-radio-group
v-model="ruleForm.sfggcl">
<el-radio label="1">是</el-radio>
<el-radio label="0">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
</el-form>
</dialogBox>
......@@ -54,7 +52,7 @@
ruleForm: {
cllx: "",
clmc: "",
sfggcl:"0"
sfggcl: "0"
},
rules: {
cllx: [
......@@ -62,6 +60,9 @@
],
clmc: [
{ required: true, message: '请输入材料名称', trigger: 'blur' }
],
clbm: [
{ required: true, message: '请输入材料编码', trigger: 'blur' }
]
}
}
......@@ -84,6 +85,7 @@
this.ruleForm = {
cllx: "",
clmc: "",
sfggcl: "0"
}
},
/**
......@@ -97,7 +99,7 @@
this.ruleForm = {
cllx: "",
clmc: "",
sfggcl:"0"
sfggcl: "0"
}
this.$emit("input", false);
} else {
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-15 10:04:28
* @LastEditTime: 2023-09-19 10:14:56
-->
<template>
<div class="clmlmx-box">
......@@ -257,6 +257,18 @@
this.tableData.splice(evt.newIndex, 0, targetRow);
}
})
},
dicStatus (val, code) {
let data = store.getters.dictData[code],
name = '暂无'
if (data) {
data.map((item) => {
if (item.dcode == val) {
name = item.dname
}
})
return name
}
}
}
}
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-08 16:38:43
* @LastEditTime: 2023-09-18 15:24:05
-->
<template>
<div class="szxx">
......@@ -235,7 +235,7 @@ export default {
color: #8b4534;
}
.szxx_body {
height: 280px;
min-height: 280px;
}
}
.zs-card {
......
......@@ -127,8 +127,16 @@
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="权利性质：">
<el-input disabled v-model="ruleForm.ztQlxx.qlxzmc"></el-input>
<el-form-item :class="flag ? 'marginBot0' : ''" label="权利性质">
<treeselect
disabled
v-model="ruleForm.ztQlxx.qlxzmc"
noOptionsText="暂无数据"
:default-expand-level="1"
placeholder=""
:normalizer="normalizer"
:show-count="true"
:options="dictData['A9']" />
</el-form-item>
</el-col>
<el-col :span="8">
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-14 17:19:58
* @LastEditTime: 2023-09-19 10:44:12
-->
<template>
<!-- 受理信息 -->
......@@ -100,7 +100,15 @@
</el-col>
<el-col :span="8">
<el-form-item label="权利性质：">
<el-input disabled v-model="ruleForm.ztQlxx.qlxzmc"></el-input>
<treeselect
disabled
v-model="ruleForm.ztQlxx.qlxzmc"
noOptionsText="暂无数据"
:default-expand-level="1"
placeholder=""
:normalizer="normalizer"
:show-count="true"
:options="dictData['A9']" />
</el-form-item>
</el-col>
<el-col :span="8">
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-18 14:53:24
* @LastEditTime: 2023-09-19 10:44:26
-->
<template>
<!-- 受理信息 -->
......@@ -94,7 +94,15 @@
</el-col>
<el-col :span="8">
<el-form-item label="权利性质：" prop="qlxzmc">
<el-input disabled v-model="ruleForm.qlxzmc"></el-input>
<treeselect
disabled
v-model="ruleForm.qlxzmc"
noOptionsText="暂无数据"
:default-expand-level="1"
placeholder=""
:normalizer="normalizer"
:show-count="true"
:options="dictData['A9']" />
</el-form-item>
</el-col>
</el-row>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-13 14:06:17
* @LastEditTime: 2023-09-19 10:28:39
-->
<template>
<!-- 受理信息 -->
......@@ -70,8 +70,16 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="权利性质1：">
<el-input maxlength="25" v-model="ruleForm.zdjbxx.qlxzmc"></el-input>
<el-form-item label="权利性质">
<treeselect
disabled
v-model="ruleForm.zdjbxx.qlxzmc"
noOptionsText="暂无数据"
:default-expand-level="1"
placeholder=""
:normalizer="normalizer"
:show-count="true"
:options="dictData['A9']" />
</el-form-item>
</el-col>
</el-row>
......
......@@ -2,7 +2,7 @@
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-14 17:21:19
* @LastEditTime: 2023-09-19 10:44:45
-->
<template>
<!-- 受理信息 -->
......@@ -72,7 +72,15 @@
</el-col>
<el-col :span="8">
<el-form-item label="权利性质：">
<el-input disabled v-model="ruleForm.zdjbxx.qlxzmc"></el-input>
<treeselect
disabled
v-model="ruleForm.zdjbxx.qlxzmc"
noOptionsText="暂无数据"
:default-expand-level="1"
placeholder=""
:normalizer="normalizer"
:show-count="true"
:options="dictData['A9']" />
</el-form-item>
</el-col>
</el-row>
......
......@@ -65,7 +65,15 @@
</el-col>
<el-col :span="8">
<el-form-item label="权利性质：">
<el-input disabled v-model="ruleForm.zdjbxx.qlxzmc"></el-input>
<treeselect
disabled
v-model="ruleForm.zdjbxx.qlxzmc"
noOptionsText="暂无数据"
:default-expand-level="1"
placeholder=""
:normalizer="normalizer"
:show-count="true"
:options="dictData['A9']" />
</el-form-item>
</el-col>
</el-row>
......
......@@ -65,7 +65,15 @@
</el-col>
<el-col :span="8">
<el-form-item label="权利性质：">
<el-input disabled v-model="ruleForm.zdjbxx.qlxzmc"></el-input>
<treeselect
disabled
v-model="ruleForm.zdjbxx.qlxzmc"
noOptionsText="暂无数据"
:default-expand-level="1"
placeholder=""
:normalizer="normalizer"
:show-count="true"
:options="dictData['A9']" />
</el-form-item>
</el-col>
</el-row>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-01 13:47:11
* @LastEditTime: 2023-09-19 10:45:32
-->
<template>
<!-- 受理信息 -->
......@@ -70,7 +70,15 @@
</el-col>
<el-col :span="8">
<el-form-item label="权利性质：">
<el-input disabled v-model="ruleForm.zdjbxx.qlxzmc"></el-input>
<treeselect
disabled
v-model="ruleForm.zdjbxx.qlxzmc"
noOptionsText="暂无数据"
:default-expand-level="1"
placeholder=""
:normalizer="normalizer"
:show-count="true"
:options="dictData['A9']" />
</el-form-item>
</el-col>
</el-row>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-18 11:15:30
* @LastEditTime: 2023-09-19 10:04:58
-->
<template>
<div class="from-clues">
......@@ -159,7 +159,7 @@
class="loadingtext"
@sort-change="handleSort"
:current-page.sync="pageData.currentPage"
:heightNum="305"
:heightNum="350"
:total="tableData.total"
@size-change="handleSizeChange"
@p-current-change="handleCurrentChange"
......@@ -256,12 +256,11 @@
this.queryClick();
},
/**
* @description: ywhClick
* @description: 有任务权限
* @param {*} item
* @author: renchao
*/
ywhClick (item) {
//有任务权限
if (item.sjlx == "3") {
item.djywbm = "DJBBL";
const { href } = this.$router.resolve(
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-13 14:00:51
* @LastEditTime: 2023-09-19 10:47:48
-->
<template>
<div class="from-clues">
<el-tabs type="card" v-model="activeName" @tab-click="handleTabClick" v-if="!isJump">
<el-tab-pane label="自然幢" name="zrz"></el-tab-pane>
<el-tab-pane label="多幢" name="dz"></el-tab-pane>
<el-tab-pane label="多幢" name="dz" v-if="sqywInfo.djywbm !== 'B37100'"></el-tab-pane>
</el-tabs>
<div v-show="activeName == 'zrz'">
<div class="from-clues-header">
......@@ -336,8 +336,8 @@
let refs = 'table1';
if (this.activeName == 'dz') {
refs = 'table';
this.$refs[refs].clearSelection()
} else {
}else{
this.sqywInfo.djywbm !== 'B37100' && this.$refs[refs].clearSelection()
}
const bdcdysz = this.bdcdysz
if (bdcdysz.length > 0) {
......
......@@ -40,7 +40,7 @@ export function queueDjywmc (djywbm, djqxbm) {
case "A04100"://国有建设用地使用权/房屋所有权(首次登记)
case "A06100": // 宅基地使用权/房屋所有权 || 首次登记
case "A08100": // 集体建设用地使用权/房屋所有权 || 首次登记
case "B37100":
case "B37100": // 在建工程抵押权 || 首次登记
vm = "fwsyq";
break;
case "A04200": //国有建设用地使用权/房屋所有权 || 转移登记
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-09-18 11:19:07
* @LastEditTime: 2023-09-19 10:04:04
-->
<template>
<div class="from-clues">
......@@ -43,7 +43,7 @@
<el-col :span="4" class="btnColRight">
<el-form-item>
<el-button type="primary" native-type="submit" @click="handleSearch">查询</el-button>
<el-button @click="moreQueryClick">高级查询</el-button>
<!-- <el-button @click="moreQueryClick">高级查询</el-button> -->
</el-form-item>
</el-col>
</el-row>
......@@ -140,18 +140,31 @@
console.log(name, sort);
},
/**
* @description: 高级查询
* @author: renchao
*/
moreQueryClick () { },
/**
* @description: openDialog
* @param {*} item
* @author: renchao
*/
openDialog (item) {
const { href } = this.$router.resolve('/workFrameView?bsmSlsq=' + item.bsmSlsq + '&bestepid=' + item.bestepid + '&bsmBusiness=' + item.bsmBusiness + '&type=jdcx')
window.open(href, `urlname${item.bsmSlsq}`)
if (item.sjlx == "3") {
item.djywbm = "DJBBL";
const { href } = this.$router.resolve(
"/djbworkFrameview?bsmSlsq=" +
item.bsmSlsq +
"&bestepid=" +
item.bestepid +
"&sqywbm=" +
item.djywbm
);
window.open(href, `djbworkFrameview${item.bsmSlsq}`);
} else {
const { href } = this.$router.resolve(
"/workFrameView?bsmSlsq=" +
item.bsmSlsq +
"&bestepid=" +
item.bestepid
);
window.open(href, `workFrameView${item.bsmSlsq}`);
}
}
}
}
......