优化

hailu

2023-12-12 5485673d00c80977a72295278b9584230fe384cf

优化

 src/views/equipmentManagement/installation.vue

@@ -25,7 +25,7 @@
                <el-form-item>
                    <el-button size="mini" type="primary" icon="el-icon-search"
                        @click="changePage(1)">搜索</el-button></el-form-item>
                <el-form-item v-if="roleKey=='tenant'||roleKey=='tenanthelper'">
                <el-form-item v-if="roleKey == 'tenant' || roleKey == 'tenanthelper'">
                    <el-button size="mini" type="primary" icon="el-icon-message-solid"
                        @click="openTimeOutModal">超时配置</el-button></el-form-item>
                <el-form-item style="float: right;" v-if="roleKey !== 'admin'">
@@ -44,7 +44,6 @@
                            <div>
                                {{ scope.row.device && scope.row.device.deviceName ? scope.row.device.deviceName : '--' }}
                            </div>

                        </template>
                    </el-table-column>
                    <el-table-column prop="erectoName" label="安装工人" width="120">
@@ -79,6 +78,13 @@
                        </div>
                        <div v-if="scope.row.state == 3">
                            已完成
                        </div>

                        <div v-if="scope.row.receiveTimeoutFlag == 1">
                            <el-tag size="mini" effect="dark" type="danger">接单超时</el-tag>
                        </div>
                        <div v-if="scope.row.finishTimeoutFlag == 1">
                            <el-tag size="mini" effect="dark" type="warning">结单超时</el-tag>
                        </div>
                    </template>
                </el-table-column>
@@ -317,7 +323,7 @@
            dialogImageUrl: '',
            dialogVisible: false,
            view: false,
            delDeviceId:0
            delDeviceId: 0

        }
    },
@@ -428,7 +434,7 @@
            formData.append('avatarfile', file.raw);
            formData.append('orderType', 1);
            request({
                url: '/iot/deviceOrder/profile/avatar',
                url: '/iot/deviceOrder/Install/profile/avatar',
                method: "post",
                data: formData
            }).then((res) => {
@@ -613,7 +619,7 @@
            for (let i = 0; i < this.erectoList.length; i++) {
                if (this.form.erectoId == this.erectoList[i].userId) {
                    this.form.erectoName = this.erectoList[i].nickName
                    this.form.erectoPhone=this.erectoList[i].phonenumber
                    this.form.erectoPhone = this.erectoList[i].phonenumber
                }
            }
            console.log(this.form);
@@ -628,12 +634,12 @@
                appointmentTime: this.form.appointmentTime,
                remark: this.form.remark,
                state: this.form.state,
                erectoPhone:this.form.erectoPhone
                erectoPhone: this.form.erectoPhone
            }
            if (this.form.receiveTime) {
                data.receiveTime = this.form.receiveTime
            }
           

            console.log(data);
            if (this.title == '修改安装单') {
                data.id = this.id,
@@ -718,14 +724,14 @@
        },
        delModal(item) {
            this.id = item.id
            this.delDeviceId=item.deviceId
            this.delDeviceId = item.deviceId
            this.deleteModal = true
        },
        delDate() {
            let that = this
            let data = {
                id: this.id,
                deviceId:this.delDeviceId
                deviceId: this.delDeviceId
            }
            request({
                url: `/iot/deviceOrder/${that.id}/${that.delDeviceId}`,

 src/views/equipmentManagement/maintenance.vue

@@ -81,6 +81,12 @@
                        <div v-if="scope.row.state == 3">
                            已完成
                        </div>
                        <div v-if="scope.row.receiveTimeoutFlag == 1">
                            <el-tag size="mini" effect="dark" type="danger">接单超时</el-tag>
                        </div>
                        <div v-if="scope.row.finishTimeoutFlag == 1">
                            <el-tag size="mini" effect="dark" type="warning">结单超时</el-tag>
                        </div>
                    </template>
                </el-table-column>
                <el-table-column label="用户信息">
@@ -399,7 +405,7 @@
            formData.append('avatarfile', file.raw);
            formData.append('orderType', 2);
            request({
                url: '/iot/deviceOrder/profile/avatar',
                url: '/iot/deviceOrder/Repair/profile/avatar',
                method: "post",
                data: formData
            }).then((res) => {