From a80fcaaf130286f215a35aa62450421b480b4d5a Mon Sep 17 00:00:00 2001
From: renkang <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 07 二月 2025 11:41:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
admin/src/views/contract/components/pendingBills.vue | 10 +
h5/pages/polling/detail.vue | 4
admin/src/views/workorder/components/problemReportingDetails.vue | 14 +-
admin/src/views/client/category.vue | 2
admin/src/views/stock/assetCate.vue | 6
h5/pages/login.vue | 80 ++++++----
admin/src/views/workorder/components/detail.vue | 1
admin/src/views/workorder/components/handleProblem.vue | 2
admin/src/views/workorder/problemReporting.vue | 2
h5/pages/polling/task.vue | 2
admin/src/views/stock/components/newWarehouse.vue | 3
admin/src/views/operation/components/deviceDetail.vue | 2
h5/pages/polling/point.vue | 10
admin/src/views/Inspection/components/taskDetail.vue | 6
admin/src/views/operation/components/deviceEdit.vue | 3
h5/static/side/default_empty@2x.png | 0
admin/src/views/contract/components/terminationAgreement.vue | 10 +
h5/pages.json | 7 +
admin/src/views/project/components/houseDetails.vue | 118 ++++------------
admin/src/views/stock/components/config.js | 5
h5/utils/service.js | 4
admin/src/views/stock/components/newMaterial.vue | 7
admin/src/views/project/housingList.vue | 6
admin/src/views/stock/components/inventoryDetails.vue | 8 +
admin/src/views/index.vue | 7
h5/pages/polling/empty.vue | 49 +++++++
admin/src/views/roomStatus/index.vue | 17 +
admin/src/views/stock/components/OutEdit.vue | 2
admin/src/views/finance/overdueBills.vue | 2
admin/src/views/stock/out.vue | 2
admin/src/views/stock/assetList.vue | 4
admin/src/components/base/BaseTable.vue | 2
admin/src/views/stock/record.vue | 2
admin/src/views/workorder/components/OperaYwWorkorderWindow.vue | 2
34 files changed, 224 insertions(+), 177 deletions(-)
diff --git a/admin/src/components/base/BaseTable.vue b/admin/src/components/base/BaseTable.vue
index 5b96868..7aea229 100644
--- a/admin/src/components/base/BaseTable.vue
+++ b/admin/src/components/base/BaseTable.vue
@@ -220,4 +220,4 @@
}
}
}
-</script>
\ No newline at end of file
+</script>
diff --git a/admin/src/views/Inspection/components/taskDetail.vue b/admin/src/views/Inspection/components/taskDetail.vue
index a357861..635969f 100644
--- a/admin/src/views/Inspection/components/taskDetail.vue
+++ b/admin/src/views/Inspection/components/taskDetail.vue
@@ -1,5 +1,5 @@
<template>
- <GlobalWindow title="宸℃浠诲姟璇︽儏" width="800px" :showConfirm="false" :visible.sync="isShowModal">
+ <GlobalWindow title="宸℃浠诲姟璇︽儏" width="100%" :showConfirm="false" :visible.sync="isShowModal">
<QueryForm v-model="filters" :query-form-config="queryFormConfig" @handleQuery="getDetail(1)" @clear="clear" />
<el-table v-loading="loading" :data="list" stripe>
<el-table-column prop="pointName" label="宸℃鐐瑰悕绉�" min-width="100" show-overflow-tooltip />
@@ -20,11 +20,11 @@
<el-table-column prop="" label="宸℃闄勪欢" min-width="100" show-overflow-tooltip>
<template v-slot="{ row }">
<div class="value" v-if="row.multifileList != null && row.multifileList.length">
- <div v-for="item in row.multifileList" :key="item.id" style="display: inline;margin-right: 20px">
+ <div v-for="item in row.multifileList.slice(0, 1)" :key="item.id" style="display: inline;margin-right: 20px">
<video v-if="item.fileurlFull && item.fileurlFull.endsWith('.mp4')" ref="videoRef" controls preload="auto"
style="width: 60px;height: 60px;object-fit: contain;" :src="item.fileurlFull" />
<el-image v-else-if="item.fileurlFull" style="width:60px; height: 60px" :src="item.fileurlFull"
- :preview-src-list="[item.fileurlFull]">
+ :preview-src-list="row.multifileList.map(item1 => item1.fileurlFull)">
</el-image>
</div>
</div>
diff --git a/admin/src/views/client/category.vue b/admin/src/views/client/category.vue
index 5999ff0..16a45b4 100644
--- a/admin/src/views/client/category.vue
+++ b/admin/src/views/client/category.vue
@@ -97,7 +97,7 @@
}).then(res => {
this.loading = false
this.dataList = res.records || []
- this.pagination.total = res.total || 0
+ this.tableData.pagination.total = res.total || 0
}, () => {
this.loading = false
})
diff --git a/admin/src/views/contract/components/pendingBills.vue b/admin/src/views/contract/components/pendingBills.vue
index b694d96..a068377 100644
--- a/admin/src/views/contract/components/pendingBills.vue
+++ b/admin/src/views/contract/components/pendingBills.vue
@@ -65,11 +65,17 @@
label="瀹炴敹/浠橀噾棰�">
</el-table-column>
<el-table-column
- prop="needReceivableFee"
label="闇�鏀�/浠橀噾棰�">
+ <template slot-scope="{row}">
+ <div style="display: flex; align-items: center;">
+ <el-tag type="success" v-if="row.needReceivableFee > 0">鏀�</el-tag>
+ <el-tag type="warning" v-if="row.needReceivableFee < 0">浠�</el-tag>
+ <span>{{Math.abs(row.needReceivableFee)}}</span>
+ </div>
+ </template>
</el-table-column>
<el-table-column
- prop="receivableFee"
+ prop="actPayDate"
label="搴旀敹/浠樻棩鏈�">
</el-table-column>
</el-table>
diff --git a/admin/src/views/contract/components/terminationAgreement.vue b/admin/src/views/contract/components/terminationAgreement.vue
index 835fe12..e9ed052 100644
--- a/admin/src/views/contract/components/terminationAgreement.vue
+++ b/admin/src/views/contract/components/terminationAgreement.vue
@@ -18,10 +18,14 @@
<el-table-column prop="buildingName" label="妤煎畤鍚嶇О" show-overflow-tooltip />
<el-table-column label="妤煎眰/鎴垮彿" show-overflow-tooltip>
<template slot-scope="{row}">
- {{row.floorName}}{{row.roomNum}}
+ {{row.floorName}}/{{row.roomNum}}
</template>
</el-table-column>
- <el-table-column prop="area" label="闈㈢Н" show-overflow-tooltip></el-table-column>
+ <el-table-column label="闈㈢Н" show-overflow-tooltip>
+ <template slot-scope="{row}">
+ {{row.area}}銕�
+ </template>
+ </el-table-column>
</el-table>
</div>
<div class="title">閫�绉熶俊鎭�</div>
@@ -43,7 +47,7 @@
</div>
<div class="item">
<div class="la">鍗忚绛捐鏃ユ湡</div>
- <div class="val">{{ info.signDate }}銕�</div>
+ <div class="val">{{ info.signDate }}</div>
</div>
<div class="item">
<div class="la">閫�绉熷師鍥�</div>
diff --git a/admin/src/views/finance/overdueBills.vue b/admin/src/views/finance/overdueBills.vue
index 41c000b..0c7c1eb 100644
--- a/admin/src/views/finance/overdueBills.vue
+++ b/admin/src/views/finance/overdueBills.vue
@@ -7,7 +7,7 @@
<div class="tab" :class="{ active: billType === 1 }" @click="tabsClick(1)">閫炬湡浠樻璐﹀崟</div>
</div>
<div class="btns">
- <el-button :disabled="ids.length === 0" @click="batchCall">鎵归噺鍌即</el-button>
+ <el-button :disabled="ids.length === 0" @click="batchCall" v-if="billType === 0">鎵归噺鍌即</el-button>
</div>
</div>
<el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange" stripe>
diff --git a/admin/src/views/index.vue b/admin/src/views/index.vue
index 32818b0..d39c86b 100644
--- a/admin/src/views/index.vue
+++ b/admin/src/views/index.vue
@@ -75,7 +75,7 @@
</div>
<div class="main_right_rc">
<div class="main_right_rc_title">褰撴棩鏃ョ▼锛坽{dataList.length}}锛�</div>
- <div class="main_right_rc_list">
+ <div class="main_right_rc_list" v-loading="loading">
<div class="main_right_rc_list_row" v-for="(item, index) in dataList" :key="index">
<div class="top">
<div class="top_left">
@@ -109,7 +109,8 @@
nian: '',
yue: '',
obj: {},
- dataList: []
+ dataList: [],
+ loading: false
}
},
components: { CommonFunctions, Calendar },
@@ -137,6 +138,7 @@
})
},
clickDay(e) {
+ this.loading = true
let date = e.replace("/\\//g", "-")
let arr = this.markDateMore.filter(item => {
if (item.date === date) {
@@ -148,6 +150,7 @@
} else {
this.dataList = []
}
+ this.loading = false
},
// 鑾峰彇鏃ョ▼
getMonthNoticess() {
diff --git a/admin/src/views/operation/components/deviceDetail.vue b/admin/src/views/operation/components/deviceDetail.vue
index 02633b3..de733a0 100644
--- a/admin/src/views/operation/components/deviceDetail.vue
+++ b/admin/src/views/operation/components/deviceDetail.vue
@@ -284,7 +284,7 @@
}
},
getDetail() {
- this.this.activeTabs = 0
+ this.activeTabs = 0
const { id } = this
detailById(id).then(res => {
this.info = res
diff --git a/admin/src/views/operation/components/deviceEdit.vue b/admin/src/views/operation/components/deviceEdit.vue
index 1b125ed..1abaeb7 100644
--- a/admin/src/views/operation/components/deviceEdit.vue
+++ b/admin/src/views/operation/components/deviceEdit.vue
@@ -197,7 +197,7 @@
floorId: '',
roomId: '',
- supplier: [],
+ supplier: '',
buyDate: '',
content: '',
supplierLinker: '',
@@ -228,7 +228,6 @@
created() {
this.initData()
this.getProjectLists()
- console.log(this.userInfo)
},
methods: {
getHouseVal(e) {
diff --git a/admin/src/views/project/components/houseDetails.vue b/admin/src/views/project/components/houseDetails.vue
index 394d64a..98310e9 100644
--- a/admin/src/views/project/components/houseDetails.vue
+++ b/admin/src/views/project/components/houseDetails.vue
@@ -6,10 +6,10 @@
width="100%">
<div class="right">
<div class="right_head">
- <span>{{info.roomNum}}</span>
- <el-tag type="success" v-if="info.leaseStatus === 0">寰呯璧�</el-tag>
- <el-tag type="success" v-if="info.leaseStatus === 1">宸茬璧�</el-tag>
- <el-tag type="success" v-if="info.leaseStatus === 2">鏈紑鍚璧�</el-tag>
+ <span class="right_head_title">{{info.roomNum}}</span>
+ <el-tag type="info" v-if="info.leaseStatus == 0">寰呯璧�</el-tag>
+ <el-tag type="success" v-if="info.leaseStatus == 1">宸茬璧�</el-tag>
+ <el-tag type="info" v-if="info.leaseStatus == 2">鏈紑鍚璧�</el-tag>
</div>
<div class="right_cate">
<el-tabs v-model="activeName" @tab-click="handleClick">
@@ -85,8 +85,13 @@
</template>
</el-table-column>
<el-table-column
- prop="renterName"
label="瀹㈡埛鍚嶇О">
+ <template slot-scope="{row}">
+ <div style="display: flex; align-items: center;">
+ {{row.renterName}}
+ <el-tag type="success" v-if="row.status === 1">褰撳墠绉熸埛</el-tag>
+ </div>
+ </template>
</el-table-column>
<el-table-column
prop="startDate"
@@ -177,14 +182,15 @@
value: 'id',
children: 'childCategoryList'
}" />
- <el-select v-model="form.status" style="width: 150px; margin-right: 15px;" placeholder="宸ュ崟鐘舵��">
- <el-option label="鍚敤" :value="0"></el-option>
- <el-option label="绂佺敤" :value="1"></el-option>
+ <el-select v-model="form.dealStatus" style="width: 150px; margin-right: 15px;" placeholder="宸ュ崟鐘舵��">
+ <el-option label="寰呮寚娲�" :value="0"></el-option>
+ <el-option label="宸叉寚娲�" :value="1"></el-option>
+ <el-option label="宸插鐞�" :value="2"></el-option>
</el-select>
<el-button type="primary" @click="getFetchList">鏌ヨ</el-button>
<el-button @click="clear">娓呯┖</el-button>
</div>
- <el-button type="primary" @click="$refs.operaYwWorkorderWindow.open('鏂板缓宸ュ崟')">鏂板宸ュ崟</el-button>
+ <el-button type="primary" @click="addWorkOrder">鏂板宸ュ崟</el-button>
</div>
<el-table
:data="tableData"
@@ -322,80 +328,6 @@
</el-card>
</div>
</el-tab-pane>
- <el-tab-pane label="璧勪骇淇℃伅" name="fourth">
- <div class="xm">
- <el-card>
- <div slot="header" class="clearfix">
- <span>璧勪骇娓呭崟</span>
- </div>
- <div class="xm_table">
- <div class="xm_table_search">
- <div class="xm_table_search_left">
- <el-input v-model="form.code" placeholder="璇疯緭鍏ヨ祫浜у悕绉�/缂栫爜" style="width: 200px; margin-right: 15px;"></el-input>
- <el-select v-model="value" style="width: 200px; margin-right: 15px;" placeholder="璧勪骇鍒嗙被">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
- </el-select>
- <el-button type="primary" @click="getPropertyLists">鏌ヨ</el-button>
- <el-button @click="clear">娓呯┖</el-button>
- </div>
- <el-button type="primary" @click="$refs.newMaterial.open('鏂板缓鐗╂枡')">鏂板</el-button>
- </div>
- <el-table
- :data="tableData"
- border
- v-loading="loading"
- style="width: 100%">
- <el-table-column
- prop="code"
- label="璧勪骇缂栫爜">
- </el-table-column>
- <el-table-column
- prop="name"
- label="璧勪骇鍚嶇О">
- </el-table-column>
- <el-table-column
- prop="qrcode"
- label="鏉＄爜">
- </el-table-column>
- <el-table-column
- prop="brand"
- label="鍝佺墝">
- </el-table-column>
- <el-table-column
- prop="attr"
- label="瑙勬牸鍨嬪彿">
- </el-table-column>
- <el-table-column
- prop="unitName"
- label="鍗曚綅">
- </el-table-column>
- <el-table-column
- label="搴撳瓨鏁伴噺">
- <template v-slot="scope">
- <span>{{ scope.row.maxStock }} ~ {{ scope.row.minStock }}</span>
- </template>
- </el-table-column>
- </el-table>
- <div class="xm_table_f">
- <el-pagination
- @size-change="handleSizeChange"
- @current-change="handleCurrentChange"
- :current-page="page"
- :page-sizes="[10, 20, 30, 40]"
- :page-size="pageTotal"
- layout="total, sizes, prev, pager, next, jumper"
- :total="total">
- </el-pagination>
- </div>
- </div>
- </el-card>
- </div>
- </el-tab-pane>
</el-tabs>
</div>
</div>
@@ -448,7 +380,8 @@
areaIds: [],
cateId: '',
status: '',
- name: ''
+ name: '',
+ dealStatus: ''
},
cateList: [],
categaryList: [],
@@ -460,6 +393,7 @@
methods: {
open (title, id) {
this.title = title
+ this.activeName = 'houseinfo'
this.houseId = id
detailById(id)
.then(res => {
@@ -470,7 +404,10 @@
handleEdit(row) {
this.showEdit1 = true
this.$nextTick(() => {
+ this.$refs.EditRef.param.projectId = this.info.projectId
+ this.$refs.EditRef.param.rooms = [this.info.projectId, this.info.buildingId, this.info.floor, this.info.id]
this.$refs.EditRef.isShowModal = true
+ this.$refs.EditRef.changeProject()
})
},
handleDetail(row) {
@@ -479,6 +416,13 @@
this.$refs.DetailRef.visible = true
this.$refs.DetailRef.id = row.id
this.$refs.DetailRef.getDetail()
+ })
+ },
+ addWorkOrder() {
+ this.$refs.operaYwWorkorderWindow.open('鏂板缓宸ュ崟', {
+ rooms: [this.info.projectId, this.info.buildingId, this.info.floor, this.info.id],
+ areaType: 0,
+ content: ''
})
},
// 鑾峰彇璁惧鐘舵��
@@ -562,6 +506,7 @@
this.form.status = ''
this.form.areaIds = []
this.form.cateId = ''
+ this.form.dealStatus = ''
this.form.name = ''
if (this.propsName === 'project') {
this.getTenantContract()
@@ -607,7 +552,7 @@
capacity: this.pageTotal,
page: this.page,
model: {
- roomIds: [this.houseId],
+ roomId: this.houseId,
code: this.form.code
}
}).then(res => {
@@ -739,6 +684,7 @@
this.form.cateId = ''
this.form.status = ''
this.form.name = ''
+ this.form.dealStatus = ''
this.propsName = tab._props.name
if (tab._props.name === 'project') {
this.getTenantContract()
@@ -791,7 +737,7 @@
width: 100%;
padding: 20px;
box-sizing: border-box;
- span {
+ .right_head_title {
font-size: 16px;
font-weight: bold;
color: black;
diff --git a/admin/src/views/project/housingList.vue b/admin/src/views/project/housingList.vue
index 7d0d874..15b946f 100644
--- a/admin/src/views/project/housingList.vue
+++ b/admin/src/views/project/housingList.vue
@@ -40,9 +40,9 @@
<el-table-column prop="feeArea" label="璁¤垂闈㈢Н(m虏)" min-width="80px"></el-table-column>
<el-table-column prop="" label="绉熻祦鐘舵��" min-width="80px">
<template v-slot="{row}">
- <span v-if="row.leaseStatus == 0">寰呯</span>
- <span v-else-if="row.leaseStatus == 1">宸茬</span>
- <span v-else>-</span>
+ <el-tag type="info" v-if="row.leaseStatus == 0">寰呯</el-tag>
+ <el-tag type="success" v-else-if="row.leaseStatus == 1">宸茬</el-tag>
+ <el-tag type="info" v-else-if="row.leaseStatus == 2">鏈紑鍚璧�</el-tag>
</template>
</el-table-column>
<el-table-column prop="isInvestment" label="鎷涘晢鐘舵��" min-width="60px">
diff --git a/admin/src/views/roomStatus/index.vue b/admin/src/views/roomStatus/index.vue
index 3ef5bef..33d9a28 100644
--- a/admin/src/views/roomStatus/index.vue
+++ b/admin/src/views/roomStatus/index.vue
@@ -52,7 +52,7 @@
</div>
<div class="xm_one_row">
<span>鍑虹鐜�</span>
- <span>{{(projectNums.leaseRoomAmount / projectNums.investmentRoomAmount).toFixed(2)}}%</span>
+ <span>{{rentalRate()}}%</span>
<span>寰呯闈㈢Н锛歿{projectNums.investmentArea - projectNums.leaseArea}}m虏</span>
</div>
</div>
@@ -330,7 +330,7 @@
</div>
<div class="xm_one_row">
<span>鍑虹鐜�</span>
- <span>{{(projectNums.leaseRoomAmount / projectNums.investmentRoomAmount).toFixed(2)}}%</span>
+ <span>{{rentalRate()}}%</span>
<span>寰呯闈㈢Н锛歿{projectNums.investmentArea - projectNums.leaseArea}}m虏</span>
</div>
</div>
@@ -362,7 +362,7 @@
</div>
<div class="xm_info_row" style="width: 25%; margin-top: 15px;">
<span>寤虹瓚闈㈢Н</span>
- <span>{{buildingInfo.cqArea}}銕�</span>
+ <span>{{buildingInfo.area}}銕�</span>
</div>
<div class="xm_info_row" style="width: 25%; margin-top: 15px;">
<span>璁＄闈㈢Н</span>
@@ -400,7 +400,7 @@
<el-table-column
label="鍚堝悓缂栧彿">
<template slot-scope="{row}">
- <el-button type="text">{{row.code}}</el-button>
+ <el-button type="text" @click="$refs.ContractDetailRef.open('鍚堝悓璇︽儏', row.id)">{{row.code}}</el-button>
</template>
</el-table-column>
<el-table-column
@@ -641,6 +641,8 @@
<Detail v-if="showDetail" ref="DetailRef" @close="showDetail = false" />
<!-- 鏂板缓璁惧 -->
<Edit v-if="showEdit1" ref="EditRef" @success="getDevicePage" @close="showEdit1 = false" />
+ <!-- 鍚堝悓璇︽儏 -->
+ <ContractDetail ref="ContractDetailRef" />
</div>
</template>
@@ -656,9 +658,10 @@
import Detail from '../workorder/components/detail'
import { fetchList as devicePage, getDeviceCateData, getDeviceStatus } from '@/api/Inspection/device'
import Edit from '../operation/components/deviceEdit'
+ import ContractDetail from '../contract/components/contractDetail'
export default {
name: 'index',
- components: { OperaYwWorkorderWindow, Detail, Edit },
+ components: { OperaYwWorkorderWindow, Detail, Edit, ContractDetail },
data() {
return {
showDetail: false,
@@ -746,6 +749,10 @@
if (!value) return true;
return data.name.indexOf(value) !== -1;
},
+ // 鍑虹鐜�
+ rentalRate() {
+ return ((this.projectNums.leaseArea / this.projectNums.investmentArea) * 100).toFixed(2)
+ },
// 鍒ゆ柇鎴挎�佸搴�
ifWidth(num) {
if (num >= 0 && num <= 100) {
diff --git a/admin/src/views/stock/assetCate.vue b/admin/src/views/stock/assetCate.vue
index cfa31b6..69c9400 100644
--- a/admin/src/views/stock/assetCate.vue
+++ b/admin/src/views/stock/assetCate.vue
@@ -3,11 +3,11 @@
<template v-slot:table-wrap>
<ul class="toolbar">
<li><el-button type="primary" @click="handleEdit()" icon="el-icon-plus">鏂板缓</el-button></li>
- <li><el-button type="primary" @click="exportExcel">瀵煎嚭</el-button></li>
+<!-- <li><el-button type="primary" @click="exportExcel">瀵煎嚭</el-button></li>-->
</ul>
<el-table row-key="id" :tree-props="{ children: 'childCategoryList' }" v-loading="isWorking.search"
:data="dataList" stripe @selection-change="handleSelectionChange">
- <el-table-column prop="name" label="璧勪骇鍒嗙被" min-width="100px"></el-table-column>
+ <el-table-column prop="name" label="鐗╂枡鍒嗙被" min-width="100px"></el-table-column>
<el-table-column prop="sortnum" label="鎺掑簭鐮�" min-width="100px"></el-table-column>
<el-table-column v-if="containPermissions(['business:category:update', 'business:category:delete'])" label="鎿嶄綔"
min-width="120" fixed="right">
@@ -68,7 +68,7 @@
methods: {
handleEdit(row) {
this.isShowEdit = true
- let str = row && row.id ? '缂栬緫璧勪骇鍒嗙被' : '鏂板缓璧勪骇鍒嗙被'
+ let str = row && row.id ? '缂栬緫鐗╂枡鍒嗙被' : '鏂板缓鐗╂枡鍒嗙被'
this.$nextTick(() => {
this.$refs.CateEditRef.open(str)
this.$refs.CateEditRef.getList()
diff --git a/admin/src/views/stock/assetList.vue b/admin/src/views/stock/assetList.vue
index 1b28a25..90214cc 100644
--- a/admin/src/views/stock/assetList.vue
+++ b/admin/src/views/stock/assetList.vue
@@ -7,8 +7,8 @@
<el-button>瀵煎叆</el-button>
</div>
<el-table v-loading="loading" :data="list" stripe>
- <el-table-column prop="code" label="璧勪骇缂栫爜" min-width="100" show-overflow-tooltip />
- <el-table-column prop="name" label="璧勪骇鍚嶇О" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="code" label="鐗╂枡缂栫爜" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="name" label="鐗╂枡鍚嶇О" min-width="100" show-overflow-tooltip />
<el-table-column prop="qrcode" label="鏉＄爜" min-width="100" show-overflow-tooltip />
<el-table-column prop="brand" label="鍝佺墝" min-width="100" show-overflow-tooltip />
<el-table-column prop="attr" label="瑙勬牸鍨嬪彿" min-width="100" show-overflow-tooltip />
diff --git a/admin/src/views/stock/components/OutEdit.vue b/admin/src/views/stock/components/OutEdit.vue
index 0bad33c..6b6f47b 100644
--- a/admin/src/views/stock/components/OutEdit.vue
+++ b/admin/src/views/stock/components/OutEdit.vue
@@ -82,7 +82,7 @@
rules,
storeList: [],
list: [],
- StoreTypeOps: StoreTypeOps.filter(i => i.type == 1),
+ StoreTypeOps: StoreTypeOps.filter(i => i.type == 1 && i.id != 10),
dataList: [],
}
diff --git a/admin/src/views/stock/components/config.js b/admin/src/views/stock/components/config.js
index f03110b..5254e88 100644
--- a/admin/src/views/stock/components/config.js
+++ b/admin/src/views/stock/components/config.js
@@ -3,13 +3,14 @@
{ name: '棰嗙敤閫�鍥�', id: 1, type: 0 },
{ name: '搴撳瓨璋冩暣', id: 2, type: 0 },
{ name: '鍏跺畠鍏ュ簱', id: 3, type: 0 },
- // { name: '鐩樼泩鍏ュ簱', id: 4, type: 0 },
+ { name: '鐩樼泩鍏ュ簱', id: 4, type: 0 },
+
{ name: '棰嗙敤鍑哄簱', id: 5, type: 1 },
{ name: '浠撳簱鍑哄崟', id: 6, type: 1 },
{ name: '璋冩暣鍑哄簱', id: 7, type: 1 },
{ name: '閲囪喘鍑哄簱', id: 8, type: 1 },
{ name: '鍏跺畠鍑哄簱', id: 9, type: 1 },
- // { name: '鐩樺嚭鍑哄簱', id: 10, type: 1 },
+ { name: '鐩樹簭鍑哄簱', id: 10, type: 1 },
]
export const rules = {
warehouseId: [{ required: true, message: '璇烽�夋嫨', trigger: 'blur' }],
diff --git a/admin/src/views/stock/components/inventoryDetails.vue b/admin/src/views/stock/components/inventoryDetails.vue
index 790d7bf..b47d41c 100644
--- a/admin/src/views/stock/components/inventoryDetails.vue
+++ b/admin/src/views/stock/components/inventoryDetails.vue
@@ -68,7 +68,13 @@
<el-table-column prop="materialUnitName" label="鍗曚綅" show-overflow-tooltip />
<el-table-column prop="warehouseName" label="鎵�鍦ㄤ粨搴�" show-overflow-tooltip />
<el-table-column prop="stock" label="璐﹂潰鏁伴噺" show-overflow-tooltip />
- <el-table-column prop="actStock" label="鐩樼偣鏁伴噺" show-overflow-tooltip />
+ <el-table-column label="鐩樼偣鏁伴噺" show-overflow-tooltip>
+ <template slot-scope="{row}">
+ <span style="color: red;" v-if="row.type === 1">{{row.actStock}}</span>
+ <span style="color: green;" v-else-if="row.type === 2">{{row.actStock}}</span>
+ <span v-else>{{row.actStock}}</span>
+ </template>
+ </el-table-column>
<el-table-column prop="remark" label="澶囨敞" show-overflow-tooltip />
</el-table>
</div>
diff --git a/admin/src/views/stock/components/newMaterial.vue b/admin/src/views/stock/components/newMaterial.vue
index 6c45610..6f887f4 100644
--- a/admin/src/views/stock/components/newMaterial.vue
+++ b/admin/src/views/stock/components/newMaterial.vue
@@ -10,7 +10,7 @@
<el-form :model="form" label-position="top" ref="form" :rules="rules">
<div class="list">
<el-form-item label="鐗╂枡缂栫爜" prop="code">
- <el-input v-model="form.code" placeholder="涓嶈緭鍏ョ郴缁熶細鑷姩缂栫爜" v-trim />
+ <el-input v-model="form.code" :disabled="form.id" placeholder="涓嶈緭鍏ョ郴缁熶細鑷姩缂栫爜" v-trim />
</el-form-item>
<el-form-item label="鐗╂枡鍚嶇О" prop="name">
<el-input v-model="form.name" placeholder="璇疯緭鍏�" v-trim />
@@ -46,7 +46,9 @@
:action="uploadImgUrl"
:file-list="fileList"
:data="uploadData"
+ :limit="1"
list-type="picture-card"
+ :on-exceed="exceed"
:on-success="uploadAvatarSuccess"
:on-remove="dele">
<i class="el-icon-plus"></i>
@@ -147,6 +149,9 @@
}
})
},
+ exceed() {
+ this.$message.warning('鍙兘涓婁紶涓�寮犲浘鐗囷紒')
+ },
getCateVal(e) {
this.form.parentCateId = e[0]
this.form.cateId = e[1]
diff --git a/admin/src/views/stock/components/newWarehouse.vue b/admin/src/views/stock/components/newWarehouse.vue
index e2f076b..92b7471 100644
--- a/admin/src/views/stock/components/newWarehouse.vue
+++ b/admin/src/views/stock/components/newWarehouse.vue
@@ -63,7 +63,8 @@
},
// 楠岃瘉瑙勫垯
rules: {
- name: [{ required: true, message: '浠撳簱鍚嶇О涓嶈兘涓虹┖', trigger: 'blur' }]
+ name: [{ required: true, message: '浠撳簱鍚嶇О涓嶈兘涓虹┖', trigger: 'blur' }],
+ userId: [{ required: true, message: '璐熻矗浜轰笉鑳戒负绌�', trigger: 'blur' }]
},
userList: []
}
diff --git a/admin/src/views/stock/out.vue b/admin/src/views/stock/out.vue
index c94aedf..f181d40 100644
--- a/admin/src/views/stock/out.vue
+++ b/admin/src/views/stock/out.vue
@@ -87,7 +87,7 @@
label: '鍑哄簱绫诲瀷',
labelCode: 'name',
valueCode: 'id',
- options: StoreTypeOps.filter(i => i.type == 0)
+ options: StoreTypeOps.filter(i => i.type == 1)
},
],
online: true
diff --git a/admin/src/views/stock/record.vue b/admin/src/views/stock/record.vue
index b2e1863..94cc276 100644
--- a/admin/src/views/stock/record.vue
+++ b/admin/src/views/stock/record.vue
@@ -5,7 +5,7 @@
<el-button @click="handleEx()" v-permissions="['business:ywoutinboundrecord:exportExcel']">瀵煎嚭</el-button>
</div>
<el-table v-loading="loading" :data="list" stripe>
- <el-table-column prop="doneDate" label="鍗曟嵁鏃ユ湡" min-width="90" show-overflow-tooltip />
+ <el-table-column prop="doneDate" label="鍗曟嵁鏃ユ湡" min-width="100" show-overflow-tooltip />
<el-table-column prop="materialCode" label="鐗╂枡缂栫爜" min-width="90" show-overflow-tooltip />
<el-table-column prop="materialName" label="鐗╂枡鍚嶇О" min-width="90" show-overflow-tooltip />
<el-table-column prop="carCodeFront" label="鐗╂枡鍒嗙被" min-width="120" show-overflow-tooltip>
diff --git a/admin/src/views/workorder/components/OperaYwWorkorderWindow.vue b/admin/src/views/workorder/components/OperaYwWorkorderWindow.vue
index f3c7e3a..10a54bb 100644
--- a/admin/src/views/workorder/components/OperaYwWorkorderWindow.vue
+++ b/admin/src/views/workorder/components/OperaYwWorkorderWindow.vue
@@ -156,6 +156,7 @@
methods: {
open(title, target) {
this.title = title
+ this.fileList = []
this.visible = true
this.getProject()
this.getCate()
@@ -201,6 +202,7 @@
}
// 缂栬緫
this.$nextTick(() => {
+ this.$refs.form.resetFields()
for (const key in this.form) {
this.form[key] = target[key]
}
diff --git a/admin/src/views/workorder/components/detail.vue b/admin/src/views/workorder/components/detail.vue
index 0743cfa..22fccbd 100644
--- a/admin/src/views/workorder/components/detail.vue
+++ b/admin/src/views/workorder/components/detail.vue
@@ -225,7 +225,6 @@
openWT() {
getByWorkorderId(this.id)
.then(res => {
- console.log(res)
this.$refs.problemReportingDetails.open('闂涓婃姤璇︽儏', res)
})
},
diff --git a/admin/src/views/workorder/components/handleProblem.vue b/admin/src/views/workorder/components/handleProblem.vue
index 6560bc3..838ab1f 100644
--- a/admin/src/views/workorder/components/handleProblem.vue
+++ b/admin/src/views/workorder/components/handleProblem.vue
@@ -104,7 +104,7 @@
:file-list="form.workOrderFileList"
accept=".png,.jpg,.jpeg,.PNG,.JPG"
:on-success="getFile"
- :data="{ folder: 'YW_PROBLEM' }"
+ :data="{ folder: 'YW_WORKORDER' }"
list-type="picture-card">
<i class="el-icon-plus"></i>
</el-upload>
diff --git a/admin/src/views/workorder/components/problemReportingDetails.vue b/admin/src/views/workorder/components/problemReportingDetails.vue
index cbdcbbb..8d52710 100644
--- a/admin/src/views/workorder/components/problemReportingDetails.vue
+++ b/admin/src/views/workorder/components/problemReportingDetails.vue
@@ -10,9 +10,9 @@
<div class="title">闂璇︽儏</div>
<el-tag style="margin-left: 10px;" v-if="form.dealStatus === 0">寰呭鐞�</el-tag>
<el-tag style="margin-left: 10px;" v-if="form.dealStatus === 1">宸茶浆宸ュ崟</el-tag>
- <el-tag style="margin-left: 10px;" v-if="form.dealStatus === 2">宸插叧闂�</el-tag>
+ <el-tag style="margin-left: 10px;" type="info" v-if="form.dealStatus === 2">宸插叧闂�</el-tag>
</div>
- <el-button @click="handleDetail" v-if="form.dealStatus === 1">鏌ョ湅宸ュ崟</el-button>
+ <el-button @click="handleDetail" v-if="form.dealStatus === 1">鏌ョ湅宸ュ崟{{form.workorderId}}</el-button>
</div>
<div class="wt_content">
<div class="wt_content_row" style="width: 25%;">
@@ -45,7 +45,7 @@
</div>
<div class="wt_head">
<div class="wt_head_title">
- <div class="title">闂璇︽儏</div>
+ <div class="title">澶勭悊缁撴灉</div>
</div>
</div>
<div class="wt_content">
@@ -64,7 +64,7 @@
</div>
</div>
<!-- 宸ュ崟璇︽儏 -->
- <Detail v-if="showDetail" ref="DetailRef" @close="showDetail = false" />
+ <Detail v-if="showDetail" ref="DetailRef1" @close="showDetail = false" />
</GlobalWindow>
</template>
@@ -96,9 +96,9 @@
handleDetail() {
this.showDetail = true
this.$nextTick(() => {
- this.$refs.DetailRef.visible = true
- this.$refs.DetailRef.id = this.form.workorderId
- this.$refs.DetailRef.getDetail()
+ this.$refs.DetailRef1.visible = true
+ this.$refs.DetailRef1.id = this.form.workorderId
+ this.$refs.DetailRef1.getDetail()
})
},
returnText(status) {
diff --git a/admin/src/views/workorder/problemReporting.vue b/admin/src/views/workorder/problemReporting.vue
index 1de3fb4..46931bc 100644
--- a/admin/src/views/workorder/problemReporting.vue
+++ b/admin/src/views/workorder/problemReporting.vue
@@ -28,7 +28,7 @@
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<el-table v-loading="isWorking.search" :data="tableData.list" stripe>
- <el-table-column prop="remark" label="鎻忚堪" min-width="70px"></el-table-column>
+ <el-table-column prop="content" label="鎻忚堪" min-width="70px"></el-table-column>
<el-table-column prop="position" label="浣嶇疆" min-width="100px"></el-table-column>
<el-table-column label="鐜板満鍥剧墖" min-width="100px">
<template slot-scope="{row}">
diff --git a/h5/pages.json b/h5/pages.json
index 908bd3a..f5f619d 100644
--- a/h5/pages.json
+++ b/h5/pages.json
@@ -118,6 +118,13 @@
{
"navigationBarTitleText" : "浠诲姟涓績"
}
+ },
+ {
+ "path" : "pages/polling/empty",
+ "style" :
+ {
+ "navigationBarTitleText" : "鎵爜宸℃"
+ }
}
],
"globalStyle": {
diff --git a/h5/pages/login.vue b/h5/pages/login.vue
index dc65036..2a7e31a 100644
--- a/h5/pages/login.vue
+++ b/h5/pages/login.vue
@@ -29,8 +29,8 @@
loginPost,
getUserInfo,
sendSMsPost,
- ywWxAuthorize,
-
+ ywWxAuthorize,
+
getRecordByUserPoint
} from '@/api'
import {
@@ -45,7 +45,7 @@
form: {
phone: '',
code: ''
- },
+ },
ywinfo: {},
downTime: 0,
code: ''
@@ -53,11 +53,11 @@
},
onLoad(option) {
console.log('onLoad');
- // https://zhcg.fnwtzx.com/#/pages/login?type=0&ywid=ywid
- const ywinfo = uni.getStorageSync('ywinfo') || {}
- if (ywinfo.ywid && (ywinfo.type || ywinfo.type == 0)) {
- this.ywinfo = ywinfo
- uni.setStorageSync('ywinfo', {})
+ // https://zhcg.fnwtzx.com/#/pages/login?type=0&ywid=ywid
+ const ywinfo = uni.getStorageSync('ywinfo') || {}
+ if (ywinfo.ywid && (ywinfo.type || ywinfo.type == 0)) {
+ this.ywinfo = ywinfo
+ uni.setStorageSync('ywinfo', {})
}
if (option.ywid || option.ywid == 0) {
uni.setStorageSync('ywinfo', {
@@ -83,7 +83,7 @@
code: code || this.code
}).then(res => {
if (res.code === 200) {
- console.log('res', res);
+ // console.log('res', res);
that.$store.commit('setOpenId', res.data.openid)
if (res.data.token && res.data.token != '') {
that.$store.commit('setToken', res.data.token)
@@ -91,13 +91,19 @@
that.$store.commit('setUserInfo', ress.data)
})
const ywinfo = this.ywinfo
- if (ywinfo.ywid && (ywinfo.type || ywinfo.type == 0)) {
- getRecordByUserPoint({pointCode: ywinfo.ywid}).then(res => {
- if(res.data && res.data.id){
- uni.redirectTo({
- url: "/pages/polling/point?id=" + res.data.id
- })
- }
+ if (ywinfo.ywid && (ywinfo.type || ywinfo.type == 0)) {
+ getRecordByUserPoint({
+ pointCode: ywinfo.ywid
+ }).then(res => {
+ if (res.data && res.data.id) {
+ uni.redirectTo({
+ url: "/pages/polling/point?id=" + res.data.id
+ })
+ } else {
+ uni.redirectTo({
+ url: "/pages/polling/empty"
+ })
+ }
})
} else {
setTimeout(() => {
@@ -111,8 +117,8 @@
})
} else {
// let url = 'https://zhcg.fnwtzx.com/yunwei_h5'
- // const appID = 'wx95ac1efb67f0330d'
- let url = 'https://dmtest.ahapp.net/yunwei_h5'
+ // const appID = 'wx95ac1efb67f0330d'
+ let url = 'https://dmtest.ahapp.net/yunwei_h5'
const appID = 'wx4d7c10bdec51942b'
let uri = encodeURIComponent(url)
let authURL =
@@ -145,22 +151,28 @@
this.setToken(res.data)
this.showToast('鐧诲綍鎴愬姛')
getUserInfo().then(ress => {
- this.setUserInfo(ress.data)
- const ywinfo = this.ywinfo
- if (ywinfo.ywid && (ywinfo.type || ywinfo.type == 0)) {
- getRecordByUserPoint({pointCode: ywinfo.ywid}).then(res => {
- getRecordByUserPoint({pointCode: ywinfo.ywid}).then(res => {
- if(res.data && res.data.id){
- uni.redirectTo({
- url: "/pages/polling/point?id=" + res.data.id
- })
- }
- })
- })
- } else {
- uni.redirectTo({
- url: "/pages/index"
- })
+ this.setUserInfo(ress.data)
+ const ywinfo = this.ywinfo
+ if (ywinfo.ywid && (ywinfo.type || ywinfo.type == 0)) {
+ // getRecordByUserPoint({pointCode: ywinfo.ywid}).then(res => {
+ getRecordByUserPoint({
+ pointCode: ywinfo.ywid
+ }).then(res => {
+ if (res.data && res.data.id) {
+ uni.redirectTo({
+ url: "/pages/polling/point?id=" + res.data.id
+ })
+ } else {
+ uni.redirectTo({
+ url: "/pages/polling/empty"
+ })
+ }
+ })
+ // })
+ } else {
+ uni.redirectTo({
+ url: "/pages/index"
+ })
}
})
}
diff --git a/h5/pages/polling/detail.vue b/h5/pages/polling/detail.vue
index 2f2620a..202dfeb 100644
--- a/h5/pages/polling/detail.vue
+++ b/h5/pages/polling/detail.vue
@@ -42,7 +42,7 @@
<template v-if="item.status == 1">
<view class="line">
<view class="la">宸℃缁撴灉锛�</view>
- <view class="val" :class="{ red: item.dealStatus == 1 }">{{ item.dealStatus == 0 ? '姝ｅ父' : '寮傚父' }}</view>
+ <view class="val" :class="{ red: item.dealStatus == 1 }">{{ item.dealStatus == 0 ? '姝ｅ父' : item.dealStatus == 1 ? '寮傚父' : '-' }}</view>
</view>
<view class="line">
<view class="la">宸℃鏃堕棿锛�</view>
@@ -181,7 +181,7 @@
this.info = res.data
let time = new Date(res.data.startDate).getTime()
console.log('res.data.startDate', new Date().getTime());
- this.flag = new Date().getTime() > time && (this.info.status == 0 || this.info.status == 1)
+ this.flag = new Date().getTime() > time && (this.info.status == 0 || this.info.status == 1 || this.info.status == 2)
})
ywPatrolTaskRecord({
capacity: 999,
diff --git a/h5/pages/polling/empty.vue b/h5/pages/polling/empty.vue
new file mode 100644
index 0000000..00181a5
--- /dev/null
+++ b/h5/pages/polling/empty.vue
@@ -0,0 +1,49 @@
+<template>
+ <view class="main_app">
+ <image class="logo" src="@/static/side/default_empty@2x.png" mode=""></image>
+ <view class="btn" @click="backHome">杩斿洖涓婚〉</view>
+ </view>
+</template>
+
+<script>
+ export default {
+ data() {
+ return {
+
+ };
+ },
+ methods: {
+ backHome(){
+ uni.redirectTo({
+ url: '/pages/index'
+ })
+ }
+ }
+ }
+</script>
+
+<style lang="scss">
+.main_app{
+ .logo{
+ width: 272rpx;
+ height: 228rpx;
+ margin: 60% auto 0;
+ }
+ .btn{
+ position: fixed;
+ bottom: 64rpx;
+ left: 40rpx;
+ width: 670rpx;
+ height: 88rpx;
+ background: #0068FF;
+ box-shadow: 0rpx 8rpx 20rpx 0rpx rgba(0,104,255,0.3);
+ border-radius: 44rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-weight: 500;
+ font-size: 32rpx;
+ color: #FFFFFF;
+ }
+}
+</style>
diff --git a/h5/pages/polling/point.vue b/h5/pages/polling/point.vue
index 122737b..a71efb0 100644
--- a/h5/pages/polling/point.vue
+++ b/h5/pages/polling/point.vue
@@ -8,7 +8,7 @@
<template v-if="info.status == 1">
<view class="line">
<div class="la">宸℃缁撴灉锛�</div>
- <div class="val primaryColor" :class="{red: info.dealStatus == 1}">{{ info.dealStatus == 0 ? '姝ｅ父' : '寮傚父' }}
+ <div class="val primaryColor" :class="{red: info.dealStatus == 1}">{{ info.dealStatus == 0 ? '姝ｅ父' : info.dealStatus == 1 ? '寮傚父' : '-' }}
</div>
</view>
<view class="line">
@@ -141,10 +141,10 @@
id: 1,
name: '寮傚父'
},
- {
- id: '',
- name: '璺宠繃'
- },
+ // {
+ // id: 2,
+ // name: '璺宠繃'
+ // },
]
],
diff --git a/h5/pages/polling/task.vue b/h5/pages/polling/task.vue
index e76a9cc..0fcaf6b 100644
--- a/h5/pages/polling/task.vue
+++ b/h5/pages/polling/task.vue
@@ -44,7 +44,7 @@
<view class="line" @click="itemClick(item)">鎵ц鏃堕棿锛歿{ item.startDate.slice(11, 16) }} 鑷� {{ item.endDate.slice(11, 16) }}</view>
<view class="line">
<view @click="itemClick(item)">瀹屾垚鎯呭喌锛歿{item.finishNum || 0}}/{{item.patrolNum}}</view>
- <view v-if="param.queryStatus == '0,1' && item.flag && (item.status == 0 || item.status == 1)" class="btn" @click="openSc(item)">
+ <view v-if="param.queryStatus == '0,1' && item.flag && (item.status == 0 || item.status == 1 || item.status == 2)" class="btn" @click="openSc(item)">
<image src="@/static/side/ic_saoma@2x.png" class="saoma" mode=""></image>
<view>鎵爜宸℃</view>
</view>
diff --git a/h5/static/side/default_empty@2x.png b/h5/static/side/default_empty@2x.png
new file mode 100644
index 0000000..72c83fd
--- /dev/null
+++ b/h5/static/side/default_empty@2x.png
Binary files differ
diff --git a/h5/utils/service.js b/h5/utils/service.js
index 0a05213..6df5176 100644
--- a/h5/utils/service.js
+++ b/h5/utils/service.js
@@ -37,10 +37,10 @@
if (data.code === 500 || data.code === 5112) {
uni.clearStorageSync()
return uni.navigateTo({
- url: '/pages/login/login'
+ url: '/pages/login'
})
}
- return
+ return resolve(data)
}
resolve(data)
// return response.data
--
Gitblit v1.9.3