bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
liang.chao 2024-03-20 11:12:40 +08:00
parent 4718646984 c45a655aa8
commit 04b0fb11b5
6 changed files with 25 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
sgzb-ui/src/views/claimAndRefund/receive/agreement.vue
View File

@ -141,8 +141,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="往来单位:" prop="unitId"> <el-form-item label="往来单位:" prop="unitId" >
<el-select v-model="form.unitId" filterable placeholder="请选择往来单位" > <el-select v-model="form.unitId" filterable placeholder="请选择往来单位" style="width:100%;">
<el-option <el-option
v-for="item in unitList" v-for="item in unitList"
:key="item.unitId" :key="item.unitId"
@ -157,7 +157,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="工程名称" prop="projectId"> <el-form-item label="工程名称" prop="projectId">
<el-select v-model="form.projectId" filterable placeholder="请选择工程名称" > <el-select v-model="form.projectId" filterable placeholder="请选择工程名称" style="width:100%;" >
<el-option <el-option
v-for="item in projectList" v-for="item in projectList"
:key="item.projectId" :key="item.projectId"
@ -169,7 +169,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="协议类型" prop="protocol"> <el-form-item label="协议类型" prop="protocol">
<el-select v-model="form.protocol" filterable placeholder="请选择协议类型" > <el-select v-model="form.protocol" filterable placeholder="请选择协议类型" style="width:100%;">
<el-option <el-option
v-for="item in protocolList" v-for="item in protocolList"
:key="item.protocolId" :key="item.protocolId"
@ -182,18 +182,6 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12">
<el-form-item label="协议类型" prop="protocol">
<el-select v-model="form.protocol" filterable placeholder="请选择协议类型" >
<el-option
v-for="item in protocolList"
:key="item.protocolId"
:label="item.protocolName"
:value="item.protocolId"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="开始日期" prop="planStartTime"> <el-form-item label="开始日期" prop="planStartTime">
<el-date-picker <el-date-picker
@ -205,14 +193,14 @@
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item label="租赁期限(天)" prop="leaseDay">
<el-input-number v-model="form.leaseDay" placeholder="请输入租赁期限(天)" controls-position="right" :min="0" style="width:100%;"/>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12">
<el-form-item label="租赁期限(天)" prop="leaseDay">
<el-input-number v-model="form.leaseDay" placeholder="请输入租赁期限(天)" controls-position="right" :min="0" />
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="签订日期" prop="signTime"> <el-form-item label="签订日期" prop="signTime">
<el-date-picker <el-date-picker
@ -224,20 +212,25 @@
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="授权人" prop="authPerson"> <el-form-item label="授权人" prop="authPerson">
<el-input <el-input
maxlength="50" v-model="form.authPerson" placeholder="请输入授权人" /> maxlength="50" v-model="form.authPerson" placeholder="请输入授权人" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="联系方式" prop="phone"> <el-form-item label="联系方式" prop="phone">
<el-input v-model="form.phone" placeholder="请输入联系方式" /> <el-input v-model="form.phone" placeholder="请输入联系方式" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入备注" maxlength="200"/>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row> <el-row>
@ -258,11 +251,6 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入备注" maxlength="200"/>
</el-form-item>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer" style="text-align: center"> <div slot="footer" class="dialog-footer" style="text-align: center">

2
sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue
View File

@ -162,7 +162,7 @@ import {
getDeviceTypeTree, getDeviceTypeTree,
getAgreementInfoById, getAgreementInfoById,
submitLeaseApply, submitLeaseApply,
getTaskDetail, getLeaseListAll,
editLeaseApply, editLeaseApply,
getLeaseApplyListAll, getLeaseApplyListAll,
getLeaseApplyAuditListAll getLeaseApplyAuditListAll

4
sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue
View File

@ -152,7 +152,7 @@
<script> <script>
import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type"; import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
import { auditLeaseByCompany, getTaskDetail,rejectLeaseByCompany } from '@/api/claimAndRefund/receive' import { auditLeaseByCompany, getLeaseListAll,rejectLeaseByCompany } from '@/api/claimAndRefund/receive'
import {mapState} from 'vuex' import {mapState} from 'vuex'
export default { export default {
name: "ReceiveExamine", name: "ReceiveExamine",
@ -352,7 +352,7 @@ export default {
}, },
/** 查询 */ /** 查询 */
async getData(taskId) { async getData(taskId) {
const res = await getTaskDetail({ const res = await getLeaseListAll({
taskId taskId
}) })
this.queryParams = {...this.queryParams,...res.rows[0]} this.queryParams = {...this.queryParams,...res.rows[0]}

4
sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue
View File

@ -216,7 +216,7 @@
<script> <script>
import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type"; import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
import { getLeaseManageListAll, getUnitData, getProData, getTaskDetail } from '@/api/claimAndRefund/receive' import { getLeaseManageListAll, getUnitData, getProData, getLeaseListAll } from '@/api/claimAndRefund/receive'
import { getInfo } from '@/api/login' import { getInfo } from '@/api/login'
import vueEasyPrint from 'vue-easy-print'; import vueEasyPrint from 'vue-easy-print';
export default { export default {
@ -417,7 +417,7 @@ export default {
async openLld(row){ async openLld(row){
this.open = true this.open = true
const res = await getTaskDetail({taskId:row.taskId}) const res = await getLeaseListAll({taskId:row.taskId})
this.leaseApplyDetails = res.rows[0].leaseApplyDetails this.leaseApplyDetails = res.rows[0].leaseApplyDetails
this.leaseApplyData = res.rows[0] this.leaseApplyData = res.rows[0]

4
sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApply.vue
View File

@ -122,7 +122,7 @@
size="mini" size="mini"
type="primary" type="primary"
icon="el-icon-edit" icon="el-icon-edit"
v-if="scope.row.taskStatus==30" v-if="scope.row.taskStatus==31"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
>编辑</el-button> >编辑</el-button>
<el-button <el-button
@ -135,7 +135,7 @@
size="mini" size="mini"
type="danger" type="danger"
icon="el-icon-delete" icon="el-icon-delete"
v-if="scope.row.taskStatus==30" v-if="scope.row.taskStatus==31"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
>删除</el-button> >删除</el-button>
</template> </template>

2
sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue
View File

@ -318,7 +318,7 @@ export default {
if (that.maForm.purchaseTime) { if (that.maForm.purchaseTime) {
return ( return (
time.getTime() < Date.now() || time.getTime() < Date.now() ||
time.getTime() < new Date(that.maForm.purchaseTime).getTime() - 8.64e7 time.getTime() < new Date(that.maForm.purchaseTime).getTime()
); );
} }
return time.getTime() < Date.now(); //实现1效果 return time.getTime() < Date.now(); //实现1效果