Skip to content

F
founder_vue
Commit 26dbc280 by 叶富雄
Options

Merge remote-tracking branch 'origin/dev_xzeq' into dev_xzeq

parents 0a033a9a 006bce94
Showing with 207 additions and 90 deletions
src/api/yhz/yhz.js
......@@ -27,3 +27,6 @@ export const jsYhzYq = params =>
export const getYhCdrw = params =>
post(`${base.alyIP}/yhz/getYhCdrw`, params);
// 移交用户负责人
export const yjfzr = params =>
post(`${base.alyIP}/yhz/yjfzr `, params);
src/components/ptCxForm_components.vue
......@@ -317,16 +317,17 @@
<div>
<span class="flTtitle">信息列表</span>
<span class="flTotal">共{{ tableDataLength }}条信息</span>
<slot name="cxyhz"></slot>
</div>
<div>
<slot name="listOperation"></slot>
<div
<!-- <div
class="flTtitle Add"
@click="oneClickAnalize"
v-if="pageBs == 'queryRlqbxs'"
>
一键分析
</div>
</div> -->
<div
class="flTtitle Add"
@click="add"
......@@ -445,13 +446,32 @@
pageBs != 'xsbk' &&
pageBs != 'addThjl' &&
pageBs != 'addGlbsh' &&
pageBs != 'yhzzz' &&
pageBs != 'addTxl' &&
pageASs != 'nonewAdd' &&
pageBs != 'dzajzb' &&
pageBs != 'queryXsxx' &&
pageBs != 'qyeryrlqbxsGl' &&
pageBs != 'fzjcgxlfx' &&
pageBs != 'qyeryrlqbxsDetailList'
pageBs != 'qyeryrlqbxsDetailList' &&
pageBs != 'adjustZdxxgl' &&
pageBs != 'queryZdssdy' &&
pageBs != 'queryZdssfjdc' &&
pageBs != 'queryZdssjdc' &&
pageBs != 'queryZdsskl' &&
pageBs != 'queryZdssqtwp' &&
pageBs != 'queryZdssqz' &&
pageBs != 'queryZdssww' &&
pageBs != 'queryZdsszj' &&
pageBs != 'queryZdssydtxsb' &&
pageBs != 'qyeryrlqbxsGl' &&
pageBs != 'zdxxgl' &&
pageBs != 'queryRlqbxs' &&
pageBs != 'gzrygl' &&
pageBs != 'queryCklz' &&
pageBs != 'queryLklz' &&
pageBs != 'queryCklzG' &&
pageBs != 'queryLklzG'
"
>
<i class="el-icon-plus"></i> 新增
......@@ -481,7 +501,7 @@
>
<i class="el-icon-plus"></i> 新增
</div>
<div
<!-- <div
class="flTtitle Add"
@click="InviteUsers"
v-if="pageBs == 'queryMyyhz' && yqyhz.yhJb == '0001'"
......@@ -496,7 +516,7 @@
"
>
解散组织
</div>
</div> -->
<div
class="flTtitle Add"
@click="adds"
......@@ -836,17 +856,16 @@
<div v-else-if="columnTitle.isShowDialog">
<span
v-if="
(pageBs == 'queryRlqbxs' || pageBs == 'queryXshb' || pageBs == 'queryZdcyryxx'
) &&
scope.row.sfyqgaj == '否'
(pageBs == 'queryRlqbxs' || pageBs == 'queryXshb' || pageBs == 'queryZdcyryxx' || pageBs == 'adjustZdxxgl'
) && ( !scope.row.sfyqgaj || scope.row.sfyqgaj == '' || scope.row.sfyqgaj == '否')
"
class="dele"
><img src="../assets/img/guohuise.png"
/></span>
<span
v-if="
(pageBs == 'queryRlqbxs' || pageBs == 'queryXshb' || pageBs == 'queryZdcyryxx') &&
scope.row.sfysaj == '否'
(pageBs == 'queryRlqbxs' || pageBs == 'queryXshb' || pageBs == 'queryZdcyryxx' || pageBs == 'adjustZdxxgl') &&
( !scope.row.sfysaj || scope.row.sfyqgaj == '' || scope.row.sfysaj == '否')
"
><img src="../assets/img/shenghuise.png"
/></span>
......@@ -855,7 +874,7 @@
@click="showDialog(scope, 'guo')"
class="dele"
v-if="
(pageBs == 'queryRlqbxs' || pageBs == 'queryXshb' || pageBs == 'queryZdcyryxx') &&
(pageBs == 'queryRlqbxs' || pageBs == 'queryXshb' || pageBs == 'queryZdcyryxx' || pageBs == 'adjustZdxxgl') &&
scope.row.sfyqgaj == '是'
"
><img src="../assets/img/guo.png"
......@@ -863,7 +882,7 @@
<span
@click="showDialog(scope, 'sheng')"
v-if="
(pageBs == 'queryRlqbxs' || pageBs == 'queryXshb' || pageBs == 'queryZdcyryxx') &&
(pageBs == 'queryRlqbxs' || pageBs == 'queryXshb' || pageBs == 'queryZdcyryxx' || pageBs == 'adjustZdxxgl') &&
scope.row.sfysaj == '是'
"
><img src="../assets/img/sheng.png"
......@@ -879,8 +898,9 @@
pageBs == 'queryZdssqz' ||
pageBs == 'queryZdssww' ||
pageBs == 'queryZdssydtxsb' ||
pageBs == 'queryZdsszj') &&
scope.row.sfzdwp == '否'
pageBs == 'queryZdsszj'
) &&
( !scope.row.sfzdwp || scope.row.sfzdwp == '否')
"
><img src="../assets/img/anhuise.png"
/></span>
......@@ -1274,7 +1294,6 @@
pageBs == 'queryZjcljcqk' ||
pageASs == 'queryZjcljcqk' ||
pageBs == 'gnsyrzList' ||
pageBs == 'cxyhz' ||
pageBs == 'yhzyh' ||
pageBs == 'queryLklzG' ||
pageBs == 'queryCklzG' ||
......@@ -1391,6 +1410,7 @@
pageBs == 'addGlbsh' ||
pageBs == 'queryXshbs' ||
pageBs == 'addTxl' ||
pageBs == 'yhzzz' ||
pageBs == 'gzrygl' ||
pageBs == 'myaddZdry' ||
pageBs == 'qyeryrlqbxsDetailList' ||
......@@ -1398,7 +1418,18 @@
pageBs == 'queryFzth' ||
pageBs == 'queryRlqbxs' ||
pageBs == 'queryRlqbxs' ||
pageBs == 'xsbk'
pageBs == 'xsbk' ||
pageBs == 'adjustZdxxgl' ||
pageBs == 'queryZdssdy' ||
pageBs == 'queryZdssfjdc' ||
pageBs == 'queryZdssjdc' ||
pageBs == 'queryZdsskl' ||
pageBs == 'queryZdssqtwp' ||
pageBs == 'queryZdssqz' ||
pageBs == 'queryZdssww' ||
pageBs == 'queryZdsszj' ||
pageBs == 'queryZdssydtxsb' ||
pageBs == 'qyeryrlqbxsGl'
)
"
>修改</span
......@@ -1566,6 +1597,7 @@
pageBs != 'zdxxgl' &&
pageBs != 'queryZdcyryxx' &&
pageBs != 'queryBbkwpxx' &&
pageBs != 'cxyhz' &&
pageBs != 'hpyprwSp' &&
pageBs != 'queryfzxyr' &&
pageBs != 'qyeryrlqbxsfs' &&
......@@ -1585,9 +1617,21 @@
pageBs != 'gzzkyxs' &&
pageBs != 'queryLklz' &&
pageBs != 'queryShsery' &&
pageBs != 'yhzzz' &&
pageBs != 'myaddZdry' &&
pageBs != 'queryRlqbxs' &&
pageBs != 'queryLz'
pageBs != 'queryLz' &&
pageBs != 'adjustZdxxgl' &&
pageBs != 'queryZdssdy' &&
pageBs != 'queryZdssfjdc' &&
pageBs != 'queryZdssjdc' &&
pageBs != 'queryZdsskl' &&
pageBs != 'queryZdssqtwp' &&
pageBs != 'queryZdssqz' &&
pageBs != 'queryZdssww' &&
pageBs != 'queryZdsszj' &&
pageBs != 'queryZdssydtxsb' &&
pageBs != 'qyeryrlqbxsGl'
"
>删除</span
>
......@@ -3115,6 +3159,7 @@ export default {
self.yqyhz = response.data.yh;
self.sfkjs = response.data.sfkjs;
self.tableData = response.data.rows;
window.sessionStorage.setItem("sfkjs", response.data.sfkjs);
for (let t in self.transformFormTable) {
self.tableData.map((res) => {
res[t] = self.transformFormTable[t][res[t]];
......
src/utils/params.js
......@@ -8490,16 +8490,16 @@ const ssww_jbxx = [
placeholder: "请输入",
col: "2",
},
{
name: "计量度量单位:",
id: "sswwWpzlJldldw",
type: "codeTree",
codeTree: "",
codeOptions: [],
value: "",
placeholder: "请输入",
col: "2",
},
// {
// name: "计量度量单位:",
// id: "sswwWpzlJldldw",
// type: "codeTree",
// codeTree: "",
// codeOptions: [],
// value: "",
// placeholder: "请输入",
// col: "2",
// },
{
name: "文物保存状态:",
id: "sswwWpbcztdm",
......@@ -8932,7 +8932,7 @@ const ssfjdc_fjdcxx = [
//损失非机动车所有人信息
const ssfjdc_syrxx = [
{
name: "所有人姓名:",
name: "姓名:",
id: "ssddfjdcSoyrXm",
type: "text",
value: "",
......@@ -8940,7 +8940,7 @@ const ssfjdc_syrxx = [
col: "2",
},
{
name: "所有人常用证件:",
name: "常用证件:",
id: "ssddfjdcSoyrCyzjdm",
type: "codeTree",
codeTree: "CODE_ZJ",
......@@ -8950,7 +8950,7 @@ const ssfjdc_syrxx = [
col: "2",
},
{
name: "所有人证件号码:",
name: "证件号码:",
id: "ssddfjdcSoyrZjhm",
type: "text",
value: "",
......@@ -8959,7 +8959,7 @@ const ssfjdc_syrxx = [
prop: 'identity'
},
{
name: "所有人联系电话:",
name: "联系电话:",
id: "ssddfjdcSoyrLxdh",
type: "text",
value: "",
......@@ -12943,16 +12943,6 @@ const zdssww_jbxx = [
col: "2",
},
{
name: "计量度量单位:",
id: "sswwWpzlJldldw",
type: "codeTree",
codeTree: "",
codeOptions: [],
value: "",
placeholder: "请输入",
col: "2",
},
{
name: "文物保存状态:",
id: "sswwWpbcztdm",
type: "codeTree",
......@@ -13357,7 +13347,7 @@ const zdssfjdc_fjdcxx = [
//损失非机动车所有人信息
const zdssfjdc_syrxx = [
{
name: "所有人姓名:",
name: "姓名:",
id: "ssddfjdcSoyrXm",
type: "text",
value: "",
......@@ -13366,7 +13356,7 @@ const zdssfjdc_syrxx = [
prop: 'checkEmpty',
},
{
name: "所有人常用证件:",
name: "常用证件:",
id: "ssddfjdcSoyrCyzjdm",
type: "codeTree",
codeTree: "CODE_ZJ",
......@@ -13377,7 +13367,7 @@ const zdssfjdc_syrxx = [
prop: 'checkEmpty',
},
{
name: "所有人证件号码:",
name: "证件号码:",
id: "ssddfjdcSoyrZjhm",
type: "text",
value: "",
......@@ -13386,7 +13376,7 @@ const zdssfjdc_syrxx = [
prop: 'emptyAbleIdentity'
},
{
name: "所有人联系电话:",
name: "联系电话:",
id: "ssddfjdcSoyrLxdh",
type: "text",
value: "",
......
src/views/hbyprw/hbyprw/queryHbyp.vue
......@@ -748,34 +748,34 @@ export default {
id: "queryYhz",
label: "研判组织管理",
newAuth: "M02",
index: "3",
index: "queryYhz",
className: "iconfont icongongnengfuwu",
hasChildren: true,
hasChildren: false,
children: [
{
id: "queryYhz",
label: "研判组织管理",
index: "queryYhz",
auth: "M0201",
className: "iconfont icongongnengfuwu",
disabled: false,
},
{
id: "queryYhzYh",
label: "组织成员浏览",
index: "queryYhzYh",
auth: "M0202",
className: "iconfont icongongnengfuwu",
disabled: false,
},
{
id: "queryMyyhz",
label: "研判组织维护",
index: "queryMyyhz",
auth: "M0203",
className: "iconfont icongongnengfuwu",
disabled: false,
},
// {
// id: "queryYhz",
// label: "研判组织浏览",
// index: "queryYhz",
// auth: "M0201",
// className: "iconfont icongongnengfuwu",
// disabled: false,
// },
// {
// id: "queryYhzYh",
// label: "我的研判组织",
// index: "queryYhzYh",
// auth: "M0202",
// className: "iconfont icongongnengfuwu",
// disabled: false,
// },
// {
// id: "queryMyyhz",
// label: "研判组织维护",
// index: "queryMyyhz",
// auth: "M0203",
// className: "iconfont icongongnengfuwu",
// disabled: false,
// },
],
},
{
......@@ -1131,7 +1131,8 @@ export default {
query: {
type: "xdzl",
xsbh: scoped.row.xxzjbh,
xsType: "01",
xsType: "03",
module: 'hcyp'
},
});
},
......
src/views/hbyprw/hbyptj/queryHbyptj.vue
......@@ -614,6 +614,6 @@ export default {
text-align: center;
}
.el-date-editor{
width: 85px !important;
width: 174px !important;
}
</style>
src/views/rlqbxsxx/queryRlqbxs.vue
......@@ -7,13 +7,19 @@
:cxQueryField="cxQueryField"
:cxDefaultFormThead="cxDefaultFormThead"
:cxUrl="cxUrl"
@oneClickAnalize="oneClickAnalize"
@add="add"
@toInfor="toInfor"
@showDialogS="showDialogS"
@showDialogG="showDialogG"
ref="rightContent"
>
<template #listOperation="scope">
<span class="hbyps" @click="add(scope.scope)">
<i class="el-icon-plus"></i>新增</span
>
<span class="hbyps" @click="oneClickAnalize(scope)">
一键分析</span
>
</template>
<template #btnGroup="scope">
<span class="hbyp" @click="edit(scope.scope)">修改</span>
<span class="hbyp" @click="dele(scope.scope)">删除</span>
......@@ -1097,4 +1103,20 @@ export default {
margin-right: 16px;
cursor: pointer;
}
.hbyps {
width: 64px;
height: 24px;
background: #ffffff;
border: 1px solid #007aff;
opacity: 1;
border-radius: 4px;
text-align: center;
align-items: center;
display: inline-block;
font-size: 12px !important;
font-weight: 400 !important;
color: #007aff !important;
cursor: pointer;
margin-left: 10px;
}
</style>
src/views/xshb/xshb/djgzxs.vue
......@@ -1249,7 +1249,8 @@ export default {
query: {
type: "xdzl",
xsbh: this.xsbh,
xsType: "02",
xsType: "01",
module: 'rlqbxs'
},
});
} else {
......@@ -1258,7 +1259,8 @@ export default {
query: {
type: "xdzl",
xsbh: this.xsbh,
xsType: "01",
xsType: "02",
module: 'yzzfzxs'
},
});
}
......
src/views/xxtk/gzry/addGzry.vue
......@@ -1556,4 +1556,28 @@ export default {
</script>
<style scoped lang="scss">
.hbyp {
font-size: 14px;
font-family: Source Han Sans CN;
font-weight: 400;
line-height: 22px;
color: #007aff;
margin-right: 16px;
cursor: pointer;
}
.hbyps {
width: 64px;
height: 24px;
background: #ffffff;
border: 1px solid #007aff;
opacity: 1;
border-radius: 4px;
text-align: center;
align-items: center;
display: inline-block;
font-size: 12px !important;
font-weight: 400 !important;
color: #007aff !important;
cursor: pointer;
}
</style>
\ No newline at end of file
src/views/xxtk/gzry/queryGzry.vue
......@@ -7,11 +7,15 @@
:cxQueryField="cxQueryField"
:cxDefaultFormThead="cxDefaultFormThead"
:cxUrl="cxUrl"
@add="add"
@toInfor="toInfor"
@revokeLK="revokeLK"
ref="rightContent"
>
<template #listOperation="scope">
<span class="hbyps" @click="add(scope.scope)">
<i class="el-icon-plus"></i>新增</span
>
</template>
<template #btnGroup="scope">
<span class="hbyp" @click="edit(scope.scope)">修改</span>
<span class="hbyp" @click="dele(scope.scope)">删除</span>
......@@ -917,4 +921,19 @@ export default {
margin-right: 16px;
cursor: pointer;
}
.hbyps {
width: 64px;
height: 24px;
background: #ffffff;
border: 1px solid #007aff;
opacity: 1;
border-radius: 4px;
text-align: center;
align-items: center;
display: inline-block;
font-size: 12px !important;
font-weight: 400 !important;
color: #007aff !important;
cursor: pointer;
}
</style>
src/views/xxtk/queryCklz.vue
......@@ -7,7 +7,6 @@
:cxQueryField="cxQueryField"
:cxDefaultFormThead="cxDefaultFormThead"
:cxUrl="cxUrl"
@add="add"
@toInfor="toInfor"
>
<template #btnGroup="scope">
......
src/views/xxtk/queryLklz.vue
......@@ -7,7 +7,6 @@
:cxQueryField="cxQueryField"
:cxDefaultFormThead="cxDefaultFormThead"
:cxUrl="cxUrl"
@add="add"
@toInfor="toInfor"
>
<template #btnGroup="scope">
......
src/views/yhz/cxyhz/yhzXz.vue
......@@ -317,7 +317,7 @@
</div>
</template>
</el-table-column>
<el-table-column label="负责人" align="center" width="100">
<!-- <el-table-column label="负责人" align="center" width="100">
<template slot-scope="scope">
<el-radio
v-model="radio"
......@@ -325,7 +325,7 @@
@change.native="getRadio(scope.row, scope.$index)"
></el-radio>
</template>
</el-table-column>
</el-table-column> -->
</el-table>
<!--分页-->
<el-pagination
......
src/views/zdxx/zdcyryxx/queryZdcyryxx.vue
......@@ -453,8 +453,6 @@ export default {
this.showDialogG();
},
showDialogS(data) {
// console.log(data);
// this.bshglajS.cxFormData.rlqbxxzjbh = data.row.xxzjbh;
var params = new FormData();
params.append("limit", this.bshglajG.cxFormData.limit);
params.append("page", this.bshglajG.cxFormData.page);
......
src/views/zdxx/zdxxgl/queryZdxxgl.vue
......@@ -8,11 +8,15 @@
:cxDefaultFormThead="cxDefaultFormThead"
:cxUrl="cxUrl"
ref="rightContent"
@add="add"
@toInfor="toInfor"
@selectionChange="selectionChange"
@drzjhd="drzjhd"
>
<template #listOperation="scope">
<span class="hbyps" @click="add(scope.scope)">
<i class="el-icon-plus"></i>新增</span
>
</template>
<template #btnGroup="scope">
<span class="hbyp" @click="edit(scope.scope)">修改</span>
<span class="hbyp" @click="dele(scope.scope)">删除</span>
......@@ -568,4 +572,19 @@ export default {
margin-right: 16px;
cursor: pointer;
}
.hbyps {
width: 64px;
height: 24px;
background: #ffffff;
border: 1px solid #007aff;
opacity: 1;
border-radius: 4px;
text-align: center;
align-items: center;
display: inline-block;
font-size: 12px !important;
font-weight: 400 !important;
color: #007aff !important;
cursor: pointer;
}
</style>
src/views/zdxx/zdxxgl/sswp/sszj/detailZdsszj.vue
......@@ -36,11 +36,6 @@ export default {
objStr: "",
data: [
{
label: "案事件编号:",
prop: "asjbh",
col: "3",
},
{
label: "信息主键编号:",
prop: "xxzjbh",
col: "3",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment