Commit 4be9c43f by yangchen

Merge branch 'develop' into develop-yangchen

parents 3c44ca49 6be176d1
...@@ -3,10 +3,15 @@ export default { ...@@ -3,10 +3,15 @@ export default {
execute: function (bill, param) { execute: function (bill, param) {
let name = GMS.$hideContainer.addComponent(lincaoView, {}, function (c) { let name = GMS.$hideContainer.addComponent(lincaoView, {}, function (c) {
const year = nros.getUser().loginDate.substring(0,4) const year = nros.getUser().loginDate.substring(0,4)
const unitCode = nros.getUser().loginUnit
c.bill = bill.dom c.bill = bill.dom
c.url =`http://${param.param.ipAddress}/jq/addAssociateDatas.do?unitCode=130324&type=${param.param.type}&projectNum=1&year=${year}` const projectNum = bill.dom.getMasterData().getData().billCode.value
c.url =`http://${param.param.ipAddress}/jq/addAssociateDatas.do?unitCode=${unitCode}&type=${param.param.type}&projectNum=${projectNum}&year=${year}`
c.name = name c.name = name
c.modalShow = true; c.modalShow = true;
}) })
// } else {
// GAMS.Common.messagePrompt('缺少参数')
// }
} }
} }
\ No newline at end of file
<template> <template>
<div class=""> <div class="rbcInputControl">
<DatePicker :type="attr.column && attr.column.daterange?attr.column.daterange:'daterange'" :placement="attr.column && attr.column.placement" :value="attr.row[attr.field]"></DatePicker> <DatePicker
:type="
attr.column && attr.column.daterange
? attr.column.daterange
: 'daterange'
"
:placement="attr.column && attr.column.placement"
:value="attr.row[attr.field]"
></DatePicker>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return { return {};
};
}, },
props: { props: {
attr:{ attr: {
type:Object, type: Object,
default:()=>{} default: () => {},
} },
}, },
watch: {}, watch: {},
computed: {}, computed: {},
methods: { methods: {},
},
mounted() {}, mounted() {},
created() {}, created() {},
beforeDestroy() {}, beforeDestroy() {},
}; };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped></style>
</style>
<template> <template>
<div class=""> <div class="rbcInputControl">
<Input v-model="attr.row[attr.field]"/> <Input v-model="attr.row[attr.field]"/>
</div> </div>
</template> </template>
......
<template> <template>
<div class="detail-table"> <div class="detail-table">
<vxe-table border ref="xTable" :data="attr.attr.tableData" :show-header="attr.attr.showHeader||false" <vxe-table
:header-cell-class-name="headerCellClassName"> border
<template v-for="(column, index) in attr.attr.columns"> ref="xTable"
<vxe-table-column :field="column.field" :title="column.title" :width="column.width" :key="index"> :data="attr.attr.tableData"
<template slot-scope="scope"> :show-header="attr.attr.showHeader || false"
<component :header-cell-class-name="headerCellClassName"
v-if="column.type" :span-method="spanMethods"
:is="column.type" >
:attr="{field:column.field,row:scope.row,column:column}" <template v-for="(column, index) in attr.attr.columns">
></component> <vxe-table-column
<span v-else>{{scope.row[column.field]}}</span> :field="column.field"
</template> :title="column.title"
</vxe-table-column> :width="column.width"
</template> :height="column.height"
:align="column.align"
:key="index"
>
<template slot-scope="scope">
<component
v-if="
attr.attr.headerOne
? !attr.attr.headerOne.includes(scope.$rowIndex) &&
column.type
: column.type
"
:is="column.type"
:attr="{ field: column.field, row: scope.row, column: column }"
></component>
<span v-else style="display: inline-block; height: 38px">{{
scope.row[column.field]
}}</span>
</template>
</vxe-table-column>
</template>
</vxe-table> </vxe-table>
</div> </div>
</template> </template>
...@@ -29,24 +49,42 @@ export default { ...@@ -29,24 +49,42 @@ export default {
vxeTableControl, vxeTableControl,
dataControl, dataControl,
radioGroupControl, radioGroupControl,
inputControl inputControl,
}, },
data() { data() {
return { return {};
};
}, },
props: { props: {
attr:{ attr: {
type:Object, type: Object,
default:()=>{} default: () => {},
} },
}, },
watch: {}, watch: {},
computed: {}, computed: {},
methods: { methods: {
headerCellClassName ({ column, columnIndex }) { headerCellClassName({ column, columnIndex }) {
if (column.property === 'content') { if (column.property === "content") {
return 'col-white' return "col-white";
}
},
spanMethods({ row, $rowIndex, column, data }) {
let fields = ["firstIndex", "secondIndex"];
let cellValue = row[column.property];
if (cellValue && fields.includes(column.property)) {
let prevRow = data[$rowIndex - 1];
let nextRow = data[$rowIndex + 1];
if (prevRow && prevRow[column.property] === cellValue) {
return { rowspan: 0, colspan: 0 };
} else {
let countRowspan = 1;
while (nextRow && nextRow[column.property] === cellValue) {
nextRow = data[++countRowspan + $rowIndex];
}
if (countRowspan > 1) {
return { rowspan: countRowspan, colspan: 1 };
}
}
} }
}, },
}, },
...@@ -57,6 +95,9 @@ export default { ...@@ -57,6 +95,9 @@ export default {
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.detail-table { .detail-table {
margin-left:-11px;
margin-top:-1px;
width: calc(100% + 23px);
.vxe-header--column .col-white { .vxe-header--column .col-white {
background-color: #fff !important; background-color: #fff !important;
} }
......
...@@ -4723,13 +4723,13 @@ export default { ...@@ -4723,13 +4723,13 @@ export default {
"info": { "info": {
"param": [], "param": [],
"name": "GetMdOrgParentField", "name": "GetMdOrgParentField",
"description": "1:根据MD_ORG表中的区划字段进行筛选,2:是否启用上级区划(也就是第一个参数的值1为启用,0为不启用),3:获取的字段名(最后返回的字段名)例子:GetMdOrgParentField('SFSJ','1','name')", "description": "1:MD_ORG表中的字段名",
"title": "根据当前组织机构获取需要的区划级别字段", "title": "传入MD_ORG表中的字段获取字段的值",
"return": 0 "return": 0
} }
}, },
"description": "1:根据MD_ORG表中的区划字段进行筛选,2:是否启用上级区划(也就是第一个参数的值1为启用,0为不启用),3:获取的字段名(最后返回的字段名)例子:GetMdOrgParentField('SFSJ','1','name')", "description": "1:MD_ORG表中的字段名",
"title": "根据当前组织机构获取需要的区划级别字段", "title": "传入MD_ORG表中的字段获取字段的值",
"value": "GetMdOrgParentField" "value": "GetMdOrgParentField"
},{ },{
"discard": false, "discard": false,
......
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