intellioa
/
super-fusion-platform
mirror of http://10.10.14.221/feiliming/oa-project-vue.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity

总结、物品、即时库存报错处理

Browse Source
init
zhusiyu 3 years ago
parent 425aa2d2e4
commit 9ff377bc05
9 changed files with 68 additions and 48 deletions
Show Stats Download Patch File Download Diff File

2
src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/goodsUseCensus/components/goodsUseCensusLarge/departmentLarge.vue
Unescape View File

@ -89,7 +89,7 @@
}, },
selected_data: { selected_data: {
handler(select_data) { handler(select_data) {
if (select_data.length == 0) { if (select_data.length === undefined) {
this.deptId = this.BaseConfig.person_info_my.dep_id; this.deptId = this.BaseConfig.person_info_my.dep_id;
} else { } else {
this.deptId = select_data[select_data.length - 1].id this.deptId = select_data[select_data.length - 1].id

4
src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/goodsUseCensus/components/goodsUseCensusSmall/departmentSmall.vue
Unescape View File

@ -151,7 +151,7 @@
} }
}, },
watch: { watch: {
depObjs: function (newVal) { depObjs(newVal) {
let depObjs = []; let depObjs = [];
let depNames = "全部"; let depNames = "全部";
let depIds = ""; let depIds = "";
@ -175,7 +175,7 @@
}, },
selected_data: { selected_data: {
handler(select_data) { handler(select_data) {
if (select_data.length == 0) { if (select_data.length === undefined) {
this.deptId = this.BaseConfig.person_info_my.dep_id; this.deptId = this.BaseConfig.person_info_my.dep_id;
} else { } else {
this.deptId = select_data[select_data.length - 1].id this.deptId = select_data[select_data.length - 1].id

24
src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/stock/stock.vue
Unescape View File

@ -37,12 +37,13 @@
<script> <script>
import {Table, Icon, Cascader, InputNumber} from 'ant-design-vue'; import {Table, Icon, Cascader, InputNumber} from 'ant-design-vue';
import InterConfig from './interConfig'; import InterConfig from './interConfig';
export default{
data(){ export default {
data() {
return { return {
showPage: false, showPage: false,
listScroll: this.StaticParams.scrollOption, listScroll: this.StaticParams.scrollOption,
loading:false, loading: false,
columns: [ columns: [
{title: '类别编码', dataIndex: 'supplies_code', width: 100, key: 'supplies_code',}, {title: '类别编码', dataIndex: 'supplies_code', width: 100, key: 'supplies_code',},
{title: '物品（分类）', dataIndex: 'name', width: 120, key: 'name',}, {title: '物品（分类）', dataIndex: 'name', width: 120, key: 'name',},
@ -82,7 +83,7 @@
ACascader: Cascader, ACascader: Cascader,
AInputNumber: InputNumber AInputNumber: InputNumber
}, },
created(){ mounted() {
this.getCategoryTree(); this.getCategoryTree();
this.getStockData(); this.getStockData();
}, },
@ -101,9 +102,18 @@
method: InterConfig.getStock.method, method: InterConfig.getStock.method,
isTestLogin: InterConfig.getStock.isTestLogin, isTestLogin: InterConfig.getStock.isTestLogin,
}], (result) => { }], (result) => {
let res = result[0].data; //console.log('即时库存', result[0].data)
if (res.code === 2000) { if (result[0].data.code === 2000) {
this.options = res.data.list; let res = result[0].data;
// this.options = this.formatData(res.data.list)
res.data.list.forEach(item => {
if (item.children && item.children.length > 0) {
this.options.push(item);
} else {
delete item.children
this.options.push(item)
}
})
} }
}) })
}, },

23
src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/stock/stockLarge.vue
Unescape View File

@ -37,8 +37,9 @@
<script> <script>
import {Table, Icon, Cascader, InputNumber} from 'ant-design-vue'; import {Table, Icon, Cascader, InputNumber} from 'ant-design-vue';
import InterConfig from './interConfig'; import InterConfig from './interConfig';
export default{
data(){ export default {
data() {
return { return {
showPage: false, showPage: false,
listScroll: this.StaticParams.scrollOption, listScroll: this.StaticParams.scrollOption,
@ -93,7 +94,7 @@
ACascader: Cascader, ACascader: Cascader,
AInputNumber: InputNumber AInputNumber: InputNumber
}, },
created(){ created() {
this.getCategoryTree(); this.getCategoryTree();
this.getStockData() this.getStockData()
}, },
@ -112,13 +113,21 @@
method: InterConfig.getStock.method, method: InterConfig.getStock.method,
isTestLogin: InterConfig.getStock.isTestLogin, isTestLogin: InterConfig.getStock.isTestLogin,
}], (result) => { }], (result) => {
let res = result[0].data; if (result[0].data.code === 2000) {
if (res.code === 2000) { let res = result[0].data;
this.options = res.data.list; // this.options = this.formatData(res.data.list)
res.data.list.forEach(item => {
if (item.children && item.children.length > 0) {
this.options.push(item);
} else {
delete item.children
this.options.push(item)
}
})
} }
}) })
}, },
getStockData(){ getStockData() {
let param = { let param = {
org_id: this.BaseConfig.person_info_my.bureau_id,//机构id，必填 org_id: this.BaseConfig.person_info_my.bureau_id,//机构id，必填
person_id: this.BaseConfig.userInfo.person_id,//当前登录人员ID，必填 person_id: this.BaseConfig.userInfo.person_id,//当前登录人员ID，必填

3
src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/component/largeSummaryTable.vue
Unescape View File

@ -3,7 +3,8 @@
<vue-scroll :ops="listScroll" <vue-scroll :ops="listScroll"
:style="showPage?'height:20rem':'height:20rem'" :style="showPage?'height:20rem':'height:20rem'"
class="score-list-div"> class="score-list-div">
<a-table :dataSource="dataSource" :columns="columns" bordered :pagination="false"></a-table> <a-table :dataSource="dataSource" :columns="columns" bordered :pagination="false"
rowKey="person_id||dept_id"></a-table>
</vue-scroll> </vue-scroll>
</div> </div>
</template> </template>

2
src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/component/myLargeSummary.vue
Unescape View File

@ -168,7 +168,7 @@
let day = resData.data.day; let day = resData.data.day;
this.begin_date = moment(year + "-" + month + "-01"); this.begin_date = moment(year + "-" + month + "-01");
this.end_date = moment(year + "-" + month + "-" + day); this.end_date = moment(year + "-" + month + "-" + day);
this.searchTime = this.begin_date + "|" + this.end_date; this.dataSearchTime = this.begin_date + "|" + this.end_date;
this.workSummaryPersonOverview() this.workSummaryPersonOverview()
} }
} }

46
src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/component/submitInfo.vue
Unescape View File

@ -36,15 +36,15 @@
<a-spin class="brandCreat" :spinning="spinning2"> <a-spin class="brandCreat" :spinning="spinning2">
<vue-scroll class="summary-record-list-div" :ops="listScroll" style="height:10rem"> <vue-scroll class="summary-record-list-div" :ops="listScroll" style="height:10rem">
<a-table v-show="tableKey===1" :dataSource="dataSourceDept" :columns="columnsYear" <a-table v-show="tableKey===1" :dataSource="dataSourceDept" :columns="columnsYear"
bordered :pagination="false"></a-table> bordered :pagination="false" rowKey="person_id"></a-table>
<a-table v-show="tableKey===2" :dataSource="dataSourceDept" :columns="columnsTerm" <a-table v-show="tableKey===2" :dataSource="dataSourceDept" :columns="columnsTerm"
bordered :pagination="false"></a-table> bordered :pagination="false" rowKey="person_id"></a-table>
<a-table v-show="tableKey===3" :dataSource="dataSourceDept" :columns="columnsMonth" <a-table v-show="tableKey===3" :dataSource="dataSourceDept" :columns="columnsMonth"
bordered :pagination="false"></a-table> bordered :pagination="false" rowKey="person_id"></a-table>
<a-table v-show="tableKey===4" :dataSource="dataSourceDept" :columns="columnsWeek" <a-table v-show="tableKey===4" :dataSource="dataSourceDept" :columns="columnsWeek"
bordered :pagination="false"></a-table> bordered :pagination="false" rowKey="person_id"></a-table>
<a-table v-show="tableKey===5" :dataSource="dataSourceDept" :columns="columnsDay" <a-table v-show="tableKey===5" :dataSource="dataSourceDept" :columns="columnsDay"
bordered :pagination="false"></a-table> bordered :pagination="false" rowKey="person_id"></a-table>
</vue-scroll> </vue-scroll>
</a-spin> </a-spin>
</div> </div>
@ -52,15 +52,15 @@
<a-spin class="brandCreat" :spinning="spinning3"> <a-spin class="brandCreat" :spinning="spinning3">
<vue-scroll class="summary-record-list-div" :ops="listScroll" style="height:10rem"> <vue-scroll class="summary-record-list-div" :ops="listScroll" style="height:10rem">
<a-table v-show="orgTableKey===1" :dataSource="dataSourceOrg" :columns="columnsDeptYear" <a-table v-show="orgTableKey===1" :dataSource="dataSourceOrg" :columns="columnsDeptYear"
bordered :pagination="false"></a-table> bordered :pagination="false" rowKey="dept_id"></a-table>
<a-table v-show="orgTableKey===2" :dataSource="dataSourceOrg" :columns="columnsDeptTerm" <a-table v-show="orgTableKey===2" :dataSource="dataSourceOrg" :columns="columnsDeptTerm"
bordered :pagination="false"></a-table> bordered :pagination="false" rowKey="dept_id"></a-table>
<a-table v-show="orgTableKey===3" :dataSource="dataSourceOrg" :columns="columnsDeptMonth" <a-table v-show="orgTableKey===3" :dataSource="dataSourceOrg" :columns="columnsDeptMonth"
bordered :pagination="false"></a-table> bordered :pagination="false" rowKey="dept_id"></a-table>
<a-table v-show="orgTableKey===4" :dataSource="dataSourceOrg" :columns="columnsDeptWeek" <a-table v-show="orgTableKey===4" :dataSource="dataSourceOrg" :columns="columnsDeptWeek"
bordered :pagination="false"></a-table> bordered :pagination="false" rowKey="dept_id"></a-table>
<a-table v-show="orgTableKey===5" :dataSource="dataSourceOrg" :columns="columnsDeptDay" <a-table v-show="orgTableKey===5" :dataSource="dataSourceOrg" :columns="columnsDeptDay"
bordered :pagination="false"></a-table> bordered :pagination="false" rowKey="dept_id"></a-table>
</vue-scroll> </vue-scroll>
</a-spin> </a-spin>
</div> </div>
@ -436,10 +436,10 @@
}, },
selectedData: { selectedData: {
handler(select_data) { handler(select_data) {
if (select_data.length == 0) { if (select_data.length === undefined) {
this.deptId = this.BaseConfig.person_info_my.dep_id; this.deptId = this.BaseConfig.person_info_my.dep_id;
} else { } else {
this.deptId = select_data[0].id this.deptId = select_data[select_data.length - 1].id
this.getWorkSummaryDeptPersonOverview() this.getWorkSummaryDeptPersonOverview()
} }
}, },
@ -499,9 +499,9 @@
method: interConfig.getWorkSummaryPersonCycleStatistics.method, method: interConfig.getWorkSummaryPersonCycleStatistics.method,
isTestLogin: interConfig.getWorkSummaryPersonCycleStatistics.isTestLogin, isTestLogin: interConfig.getWorkSummaryPersonCycleStatistics.isTestLogin,
}], (result) => { }], (result) => {
let resData = result[0].data;
// console.log('我的总结-提交情况', resData) // console.log('我的总结-提交情况', resData)
if (resData.code === 2000) { if (result[0].data.code === 2000) {
let resData = result[0].data;
this.dayList = resData.data.day_list; this.dayList = resData.data.day_list;
this.weekList = resData.data.week_list; this.weekList = resData.data.week_list;
this.monthList = resData.data.month_list; this.monthList = resData.data.month_list;
@ -511,7 +511,7 @@
} }
}, },
getWorkSummaryDeptPersonOverview: function () { getWorkSummaryDeptPersonOverview: function () {
this.spinning2 = true this.spinning2 = true;
let timeStr = this.searchTime; let timeStr = this.searchTime;
if (timeStr !== "") { if (timeStr !== "") {
let startDate = timeStr.split("|")[0]; let startDate = timeStr.split("|")[0];
@ -528,18 +528,18 @@
method: interConfig.workSummaryDeptPersonOverview.method, method: interConfig.workSummaryDeptPersonOverview.method,
isTestLogin: interConfig.workSummaryDeptPersonOverview.isTestLogin, isTestLogin: interConfig.workSummaryDeptPersonOverview.isTestLogin,
}], (result) => { }], (result) => {
this.spinning2 = false this.spinning2 = false;
let resData = result[0].data; if (result[0].data.code === 2000) {
if (resData.code === 2000) { let resData = result[0].data;
let dataSource = resData.data.person_list;//1学年2学期3月报4周报5日报 let dataSource = resData.data.person_list;//1学年2学期3月报4周报5日报
this.dataSourceDept = dataSource this.dataSourceDept = dataSource;
this.changeType(); this.changeType();
} }
}) })
} }
}, },
getWorkSummaryOrgDeptOverview: function () { getWorkSummaryOrgDeptOverview: function () {
this.spinning3 = true this.spinning3 = true;
let timeStr = this.searchTime; let timeStr = this.searchTime;
if (timeStr !== "") { if (timeStr !== "") {
let startDate = timeStr.split("|")[0]; let startDate = timeStr.split("|")[0];
@ -555,11 +555,11 @@
method: interConfig.workSummaryOrgDeptOverview.method, method: interConfig.workSummaryOrgDeptOverview.method,
isTestLogin: interConfig.workSummaryOrgDeptOverview.isTestLogin, isTestLogin: interConfig.workSummaryOrgDeptOverview.isTestLogin,
}], (result) => { }], (result) => {
let resData = result[0].data; this.spinning3 = false;
//console.log('小块机构表格', resData) //console.log('小块机构表格', resData)
if (resData.code === 2000) { if (result[0].data.code === 2000) {
let resData = result[0].data;
this.dataSourceOrg = resData.data.dept_list; this.dataSourceOrg = resData.data.dept_list;
this.spinning3 = false
this.changeType(); this.changeType();
} }
}) })

4
src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/component/totalRecord.vue
Unescape View File

@ -100,10 +100,10 @@
}, },
selectedData: { selectedData: {
handler(select_data) { handler(select_data) {
if (select_data.length == 0) { if (select_data.length === undefined) {
this.deptId = this.BaseConfig.person_info_my.dep_id; this.deptId = this.BaseConfig.person_info_my.dep_id;
} else { } else {
this.deptId = select_data[0].id this.deptId = select_data[select_data.length - 1].id
this.getRecordData() this.getRecordData()
} }
}, },

8
src/views/screenAdaptation/pages/adminCenter/moduleCom/oa/summaryRecord/summaryRecordLarge.vue
Unescape View File

@ -41,7 +41,7 @@
<!--我的总结-提交情况--> <!--我的总结-提交情况-->
<a-col :span="13" v-if="tabIndex==0"> <a-col :span="13" v-if="tabIndex==0">
<bgBox :largeBgTitle="submit"> <bgBox :largeBgTitle="submit">
<submitInfo :type="tabIndex+1" :searchTime="searchTime" :largeSummary="true"></submitInfo> <submitInfo :type="tabIndex+1" :searchTime="searchTime" :largeSummary="true" :selectedData="selected_data"></submitInfo>
</bgBox> </bgBox>
</a-col> </a-col>
<!--总结概览--> <!--总结概览-->
@ -476,12 +476,12 @@
}, },
selected_data: { selected_data: {
handler(select_data) { handler(select_data) {
if (select_data[select_data.length - 1].id) { if (select_data.length === undefined) {
this.deptId = this.BaseConfig.person_info_my.dep_id;
} else {
this.deptId = select_data[select_data.length - 1].id this.deptId = select_data[select_data.length - 1].id
this.workSummaryDeptPersonOverview() this.workSummaryDeptPersonOverview()
this.workSummaryDeptCycleStatistics() this.workSummaryDeptCycleStatistics()
} else {
this.deptId = this.BaseConfig.person_info_my.dep_id;
} }
}, },
immediate: true immediate: true

Write Preview
Loading…
Cancel
Save