suojin
/
laboratory_maintenance_app
14
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "代码提交"

Browse Source 
This reverts commit e45691ea2d.
test
zhangdi 1 year ago
parent a178c46303
commit 53729c9f88
8 changed files with 77 additions and 187 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      config/status.js
  2. 32
      pages/inspection/quest.vue
  3. 17
      pages/inspection/questDetails.vue
  4. 151
      pages/inspection/questOrder.vue
  5. 16
      pages/submission/records.vue
  6. 8
      pages/submission/recordsdetails.vue
  7. 24
      pages/submission/sendOrders.vue
  8. 4
      utils/website.js

12
config/status.js
Unescape View File

@ -15,11 +15,11 @@ export const tabList = {
}, },
{ {
name: "待维修", name: "待维修",
key: "1,2,3,100", key: "1,2,3",
}, },
{ {
name: "已驳回", name: "已驳回",
key: "102", key: "100,101,102",
}, },
{ {
@ -28,7 +28,7 @@ export const tabList = {
}, },
{ {
name: "维修中", name: "维修中",
key: "5,101", key: "5",
}, },
{ {
name: "待评价", name: "待评价",
@ -152,9 +152,6 @@ export const tabListColor = {
"待评价": "#67c23a", "待评价": "#67c23a",
"待付款": "#67c23a", "待付款": "#67c23a",
"已驳回": "#f56c6c", "已驳回": "#f56c6c",
"主管驳回": "#f56c6c",
"客户驳回": "#f56c6c",
"维修驳回": "#f56c6c",
"待审批": "#409eff", "待审批": "#409eff",
"已通过": "#409eff", "已通过": "#409eff",
"待确认": "#67c23a", "待确认": "#67c23a",
@ -403,8 +400,5 @@ export const tabTaskListColor={
"维修完成": "#67c23a", "维修完成": "#67c23a",
"待付款": "#67c23a", "待付款": "#67c23a",
"已驳回": "#f56c6c", "已驳回": "#f56c6c",
"主管驳回": "#f56c6c",
"客户驳回": "#f56c6c",
"维修驳回": "#f56c6c",
} }

32
pages/inspection/quest.vue
Unescape View File

@ -74,12 +74,12 @@
</block> </block>
<!--巡检维修 维修主管 --> <!--巡检维修 维修主管 -->
<block v-if="subsectionCurrent == '1' && dataTypes == 3"> <block v-if="subsectionCurrent == '1' && dataTypes == 3">
<u-button v-if="item.repairStatus == 2||item.repairStatus == 102" size="mini" plain style="margin-right:16rpx" <u-button v-if="item.repairStatus == 2" size="mini" plain style="margin-right:16rpx"
@click="openWorkOrder(item, 'repair')">审批</u-button> @click="openWorkOrder(item, 'repair')">审批</u-button>
</block> </block>
<!--巡检维修 维修人员 --> <!--巡检维修 维修人员 -->
<block v-if="subsectionCurrent == '1' && dataTypes == 4"> <block v-if="subsectionCurrent == '1' && dataTypes == 4">
<u-button v-if="item.repairStatus == 1||item.repairStatus == 101" size="mini" plain style="margin-right:16rpx" <u-button v-if="item.repairStatus == 1" size="mini" plain style="margin-right:16rpx"
@click="openWorkOrder(item, 'repair')">提交</u-button> @click="openWorkOrder(item, 'repair')">提交</u-button>
<u-button v-if="item.repairStatus == 4" size="mini" plain style="margin-right:16rpx" <u-button v-if="item.repairStatus == 4" size="mini" plain style="margin-right:16rpx"
@click="openModel(item, 'repairComplete')">维修完成</u-button> @click="openModel(item, 'repairComplete')">维修完成</u-button>
@ -113,8 +113,7 @@
<betone-loading ref="BetLoading" /> <betone-loading ref="BetLoading" />
<!-- <betone-tabbar ref="tabbarRef" v-if="!planOrderId" /> --> <!-- <betone-tabbar ref="tabbarRef" v-if="!planOrderId" /> -->
<betone-modal v-model="detailsShow" v-if="detailsShow" :title="'下载内容'" @confirm="detailsShowFn" <betone-modal v-model="detailsShow" v-if="detailsShow" :title="'下载内容'" @confirm="detailsShowFn" @cancel="detailsShow = false">
@cancel="detailsShow = false">
<recordsdetails :data="rowInfo" :detailId="rowInfo.id" id="capture"></recordsdetails> <recordsdetails :data="rowInfo" :detailId="rowInfo.id" id="capture"></recordsdetails>
</betone-modal> </betone-modal>
<sp-html2pdf-render domId="capture" ref="renderRef" @renderOver="renderOver" pdfFileName="这是一个pdf文件" <sp-html2pdf-render domId="capture" ref="renderRef" @renderOver="renderOver" pdfFileName="这是一个pdf文件"
@ -125,7 +124,7 @@
<script> <script>
import recordsdetails from './components/details.vue' import recordsdetails from './components/details.vue'
import { tabTaskList, tabTaskRepairList, tabTaskListColor } from '@/config/status.js' import { tabTaskList, tabTaskRepairList,tabTaskListColor } from '@/config/status.js'
export default { export default {
components: { components: {
recordsdetails recordsdetails
@ -141,7 +140,7 @@ export default {
}, },
userInfo: {},//用户信息 userInfo: {},//用户信息
rowInfo: {},//选中行数据 rowInfo: {},//选中行数据
tabList: [], tabList: [],
tasktabList: [], tasktabList: [],
current: 0, current: 0,
@ -184,7 +183,7 @@ export default {
// //
return this.$store.state.dataType return this.$store.state.dataType
}, },
tagColor() { tagColor(){
return tabTaskListColor return tabTaskListColor
}, },
}, },
@ -393,7 +392,7 @@ export default {
this.$u.api.confirmPayment(query).then(res => { this.$u.api.confirmPayment(query).then(res => {
this.paymentShow = false this.paymentShow = false
if (res.code == 200) { if (res.code == 200) {
uni.showToast({ title: "确认成功", icon: "none" }); uni.showToast({ title: "确认成功", icon: "none" });
this.getRecordsList() this.getRecordsList()
@ -417,8 +416,7 @@ export default {
let sta = i.key.split(',') let sta = i.key.split(',')
return sta.includes(item + '') return sta.includes(item + '')
}) })
return newArr.length <= 0 ? '' : newArr[0].name return newArr.length<=0?'':newArr[0].name
}, },
// 巡检维修 // 巡检维修
taskStatusName(item) { taskStatusName(item) {
@ -426,18 +424,7 @@ export default {
let sta = i.key.split(',') let sta = i.key.split(',')
return sta.includes(item + '') return sta.includes(item + '')
}) })
if (this.dataTypes != 1) { return newArr.length<=0?'':newArr[0].name
if (item == 100) {
return '维修驳回'
}
if (item == 101) {
return '主管驳回'
}
if (item == 102) {
return '客户驳回'
}
}
return newArr.length <= 0 ? '' : newArr[0].name
}, },
detailsShowFn() { detailsShowFn() {
// 调用组件实例中h2cRenderDom方法 // 调用组件实例中h2cRenderDom方法
@ -465,7 +452,6 @@ export default {
.page-css { .page-css {
padding: 0; padding: 0;
padding-top: var(--status-bar-height); padding-top: var(--status-bar-height);
.page-search-top { .page-search-top {
height: 220rpx; height: 220rpx;
background-color: #fff; background-color: #fff;

17
pages/inspection/questDetails.vue
Unescape View File

@ -26,18 +26,7 @@
<text class="item_right_txt">{{ detailForm.reservationTime }}</text> <text class="item_right_txt">{{ detailForm.reservationTime }}</text>
</view> </view>
</view> </view>
<!-- 驳回信息 -->
<view class="info"
v-if="detailForm.repairStatus == 100 || detailForm.repairStatus == 101 || detailForm.repairStatus == 102">
<view class="info_title" v-if="detailForm.repairStatus == 100">维修人员驳回</view>
<view class="info_title" v-if="detailForm.repairStatus == 101">主管驳回</view>
<view class="info_title" v-if="detailForm.repairStatus == 102">客户驳回</view>
<view class="info_item">
<text class="item_left_txt">驳回原因：</text>
<text class="item_right_txt">{{ detailForm.approveRemark }}</text>
</view>
</view>
<view class="info"> <view class="info">
<view class="info_title">巡检任务</view> <view class="info_title">巡检任务</view>
<u-collapse :accordion="false"> <u-collapse :accordion="false">
@ -153,7 +142,6 @@ export default {
padding: 0; padding: 0;
padding-top: 26rpx; padding-top: 26rpx;
height: 100vh; height: 100vh;
.info { .info {
margin: 0 24rpx 20rpx; margin: 0 24rpx 20rpx;
border-radius: 20rpx; border-radius: 20rpx;
@ -194,8 +182,7 @@ export default {
// text-align: left; // text-align: left;
text-align: justify; text-align: justify;
font-family: SourceHanSansSC-regular; font-family: SourceHanSansSC-regular;
image{
image {
width: 100rpx; width: 100rpx;
height: 100rpx; height: 100rpx;
} }

151
pages/inspection/questOrder.vue
Unescape View File

@ -15,14 +15,12 @@
<view class="info_title">巡检配置</view> <view class="info_title">巡检配置</view>
<u-form labelPosition="left" ref="sendOrderForm" :model="detailForm" :label-width="200" class="repair_form"> <u-form labelPosition="left" ref="sendOrderForm" :model="detailForm" :label-width="200" class="repair_form">
<u-form-item label="巡检内容:" prop="dispatchTime" :border-bottom="false"> <u-form-item label="巡检内容:" prop="dispatchTime" :border-bottom="false">
<u-input v-model="detailForm.taskContent" :disabled="true" :border="true" <u-input v-model="detailForm.taskContent" :disabled="true" :border="true" class="sp-new-input-diabled" />
class="sp-new-input-diabled" />
</u-form-item> </u-form-item>
<u-form-item label="任务开始时间:" prop="dispatchTime" :border-bottom="false"> <u-form-item label="任务开始时间:" prop="dispatchTime" :border-bottom="false">
<u-input v-model="detailForm.startTime" :disabled="true" :border="true" <u-input v-model="detailForm.startTime" :disabled="true" :border="true" class="sp-new-input-diabled" />
class="sp-new-input-diabled" />
</u-form-item> </u-form-item>
<u-form-item label="预约上门时间:" prop="customerOpinion" :border-bottom="false"> <u-form-item label="预约上门时间:" prop="customerOpinion" :border-bottom="false">
<u-input v-if="reservationDisabled" v-model="reservationTime" type="select" <u-input v-if="reservationDisabled" v-model="reservationTime" type="select"
@ -78,21 +76,11 @@
</u-collapse-item> </u-collapse-item>
</u-collapse> </u-collapse>
</view> </view>
<view class="info"
v-if="detailForm.repairStatus == 100 || detailForm.repairStatus == 101 || detailForm.repairStatus == 102">
<view class="info_title" v-if="detailForm.repairStatus == 100">维修人员驳回</view>
<view class="info_title" v-if="detailForm.repairStatus == 101">主管驳回</view>
<view class="info_title" v-if="detailForm.repairStatus == 102">客户驳回</view>
<view class="info_item">
<text class="item_left_txt">驳回原因：</text>
<text class="item_right_txt">{{ detailForm.approveRemark }}</text>
</view>
</view>
<!-- 填写内容 --> <!-- 填写内容 -->
<view class="info" v-if="!reservationDisabled"> <view class="info" v-if="!reservationDisabled">
<view class="info_title">巡检任务</view> <view class="info_title">巡检任务</view>
<u-collapse :accordion="false" ref="collapseTask"> <u-collapse :accordion="false" ref="collapseTask">
<u-collapse-item v-for="(item, index) in detailForm.details" :key="index" @change="itemCollapseChange"> <u-collapse-item v-for="(item, index) in detailForm.details" :key="index">
<view slot="title"> <view slot="title">
<text class="collapse-title">实验室楼层：{{ item.floorName }}</text> <text class="collapse-title">实验室楼层：{{ item.floorName }}</text>
</view> </view>
@ -106,7 +94,7 @@
<view class="info_item"> <view class="info_item">
<text class="item_left_txt">状态：</text> <text class="item_left_txt">状态：</text>
<text class="item_right_txt"> <text class="item_right_txt">
<u-radio-group v-model="s.status" :disabled="taskDisabled"> <u-radio-group v-model="s.status">
<u-radio name="0">正常</u-radio> <u-radio name="0">正常</u-radio>
<u-radio name="1">异常</u-radio> <u-radio name="1">异常</u-radio>
</u-radio-group> </u-radio-group>
@ -117,20 +105,18 @@
<text class="item_left_txt">现场照片：</text> <text class="item_left_txt">现场照片：</text>
<text class="item_right_txt" v-if="s.picUrl == ''"> <text class="item_right_txt" v-if="s.picUrl == ''">
<view class="btn" v-if="!taskDisabled" @click="uploadImg(index, vindex, sindex)">上传照片</view> <view class="btn" @click="uploadImg(index, vindex, sindex)">上传照片</view>
<view v-else>无</view>
</text> </text>
<text class="item_right_txt" v-else> <text class="item_right_txt" v-else>
<image v-if="!taskDisabled" @click="uploadImg(index, vindex, sindex)" <image @click="uploadImg(index, vindex, sindex)" class="item_right_img"
class="item_right_img" :src="s.picUrl"></image> :src="s.picUrl"></image>
<image v-else class="item_right_img" :src="s.picUrl"></image>
</text> </text>
</view> </view>
<view class="info_item"> <view class="info_item">
<text class="item_left_txt">使用人签字：</text> <text class="item_left_txt">使用人签字：</text>
<text class="item_right_txt"> <text class="item_right_txt">
<u-input :disabled="taskDisabled" :border="true" v-model="s.signUrl" :placeholder="'请输入'" :class="taskDisabled?'sp-new-input-diabled':''" /> <u-input :border="true" v-model="s.signUrl" :placeholder="'请输入'" />
<!-- <image v-if="s.qianzi" :src="s.qianzi" style="width: 144px;height: 77rpx;" <!-- <image v-if="s.qianzi" :src="s.qianzi" style="width: 144px;height: 77rpx;"
mode="widthFix" @click="toPop1(index, vindex, sindex)"></image> mode="widthFix" @click="toPop1(index, vindex, sindex)"></image>
<view v-else class="btn" @click="toPop1(index, vindex, sindex)">签字</view> --> <view v-else class="btn" @click="toPop1(index, vindex, sindex)">签字</view> -->
@ -139,23 +125,22 @@
<view class="info_item"> <view class="info_item">
<text class="item_left_txt">备注：</text> <text class="item_left_txt">备注：</text>
<text class="item_right_txt"> <text class="item_right_txt">
<u-input :disabled="taskDisabled" :border="true" type="textarea" v-model="s.remark" :placeholder="'请输入'" :class="taskDisabled?'sp-new-input-diabled':''" /> <u-input :border="true" type="textarea" v-model="s.remark" :placeholder="'请输入'" />
</text> </text>
</view> </view>
<view class="info_item" <view class="info_item">
v-if="(dataTypes == 4 && (detailForm.repairStatus == 1 || detailForm.repairStatus == 101))||(dataTypes == 3 && (detailForm.repairStatus == 2 || detailForm.repairStatus == 102))">
<text class="item_left_txt">价格：</text> <text class="item_left_txt">价格：</text>
<text class="item_right_txt"> <text class="item_right_txt">
<u-input v-model="s.price" type="number" :border="true" :disabled="priceDisabled" :class="priceDisabled?'sp-new-input-diabled':''" /> <u-input v-model="s.price" type="number" :border="true" />
</text> </text>
</view> </view>
<view class="info_item" v-if="dataTypes == 1 && detailForm.repairStatus == 3"> <view class="info_item" v-if="dataTypes == 1 && detailForm.repairStatus == 3">
<text class="item_left_txt">是否维修：</text> <text class="item_left_txt">是否维修：</text>
<text class="item_right_txt"> <text class="item_right_txt">
<u-radio-group v-model="s.isRepair"> <u-radio-group v-model="s.isRepair">
<u-radio :name="1">是</u-radio> <u-radio name="1">是</u-radio>
<u-radio :name="0">否</u-radio> <u-radio name="0">否</u-radio>
</u-radio-group> </u-radio-group>
</text> </text>
</view> </view>
@ -176,13 +161,12 @@
</u-form-item> </u-form-item>
<u-form-item label="意见:" prop="reportPeople" :border-bottom="false" <u-form-item label="意见:" prop="reportPeople" :border-bottom="false"
v-if="approveInfo.approveText == '未完成'"> v-if="approveInfo.approveText == '未完成'">
<u-input v-model="approveInfo.approveRemark" :border="true" placeholder="请输入" type="textarea" <u-input v-model="approveInfo.approveRemark" :border="true" placeholder="请输入" type="textarea" :height="120" />
:height="120" />
</u-form-item> </u-form-item>
</u-form> </u-form>
</view> </view>
<!-- 维修负责人 巡检维修方案审批 --> <!-- 维修负责人 巡检维修方案审批 -->
<view class="info" v-if="dataTypes == 3 && (detailForm.repairStatus == 2 || detailForm.repairStatus == 102)"> <view class="info" v-if="dataTypes == 3 && detailForm.repairStatus == 2">
<view class="info_title">维修方案审批</view> <view class="info_title">维修方案审批</view>
<u-form labelPosition="left" ref="repairInfoForm" :model="repairApproveInfo" :label-width="140" <u-form labelPosition="left" ref="repairInfoForm" :model="repairApproveInfo" :label-width="140"
class="repair_form"> class="repair_form">
@ -194,8 +178,7 @@
</u-form-item> </u-form-item>
<u-form-item label="审批意见:" prop="reportPeople" :border-bottom="false" <u-form-item label="审批意见:" prop="reportPeople" :border-bottom="false"
v-if="repairApproveInfo.approveText == '驳回'"> v-if="repairApproveInfo.approveText == '驳回'">
<u-input v-model="repairApproveInfo.approveRemark" :border="true" placeholder="请输入" type="textarea" <u-input v-model="repairApproveInfo.approveRemark" :border="true" placeholder="请输入" type="textarea" :height="120" />
:height="120" />
</u-form-item> </u-form-item>
</u-form> </u-form>
</view> </view>
@ -213,46 +196,45 @@
</u-form-item> </u-form-item>
<u-form-item label="审批意见:" prop="reportPeople" :border-bottom="false" <u-form-item label="审批意见:" prop="reportPeople" :border-bottom="false"
v-if="customerApproveInfo.approveText == '驳回'"> v-if="customerApproveInfo.approveText == '驳回'">
<u-input v-model="customerApproveInfo.approveRemark" :border="true" placeholder="请输入" <u-input v-model="customerApproveInfo.approveRemark" :border="true" placeholder="请输入" type="textarea" :height="120" />
type="textarea" :height="120" />
</u-form-item> </u-form-item>
</u-form> </u-form>
</view> </view>
<!-- 维修人员接收任务单 --> <!-- 维修人员接收任务单 -->
<view class="repair-btn" style="margin-right: 32rpx;width:100%" <view class="repair-btn" style="margin-right: 32rpx;width:100%"
v-if="dataTypes == 4 && detailForm.taskStatus == 1 && detailsType == 'task'"> v-if="dataTypes == 4 && detailForm.taskStatus == 1&&detailsType=='task'">
<u-button size="medium" @click="endOrderCancel()">取消</u-button> <u-button size="medium" @click="endOrderCancel()">取消</u-button>
<u-button size="medium" type="primary" @click="receiveQuest()">接单</u-button> <u-button size="medium" type="primary" @click="receiveQuest()">接单</u-button>
</view> </view>
<!-- 维修人员提交巡检详情 --> <!-- 维修人员提交巡检详情 -->
<view class="repair-btn" style="margin-right: 32rpx;width:100%" <view class="repair-btn" style="margin-right: 32rpx;width:100%"
v-if="dataTypes == 4 && detailForm.taskStatus == 2 && detailsType == 'task'"> v-if="dataTypes == 4 && detailForm.taskStatus == 2&&detailsType=='task'">
<u-button size="medium" @click="endOrderCancel()">取消</u-button> <u-button size="medium" @click="endOrderCancel()">取消</u-button>
<u-button size="medium" type="primary" @click="submitQuest()">提交</u-button> <u-button size="medium" type="primary" @click="submitQuest()">提交</u-button>
</view> </view>
<!-- 客户 确认巡检任务是否完成提交 --> <!-- 客户 确认巡检任务是否完成提交 -->
<view class="repair-btn" style="margin-right: 32rpx;width:100%" <view class="repair-btn" style="margin-right: 32rpx;width:100%"
v-if="dataTypes == 1 && detailForm.taskStatus == 3 && detailsType == 'task'"> v-if="dataTypes == 1 && detailForm.taskStatus == 3&&detailsType=='task'">
<u-button size="medium" @click="endOrderCancel()">取消</u-button> <u-button size="medium" @click="endOrderCancel()">取消</u-button>
<u-button size="medium" type="primary" @click="customerQuest()">提交</u-button> <u-button size="medium" type="primary" @click="customerQuest()">提交</u-button>
</view> </view>
<!-- 维修人员 提交维修方案 --> <!-- 维修人员 提交维修方案 -->
<view class="repair-btn" style="margin-right: 32rpx;width:100%" <view class="repair-btn" style="margin-right: 32rpx;width:100%"
v-if="dataTypes == 4 && (detailForm.repairStatus == 1 || detailForm.repairStatus == 101) && detailsType == 'repair'"> v-if="dataTypes == 4 && detailForm.repairStatus == 1&&detailsType=='repair'">
<u-button size="medium" @click="endOrderCancel()">取消</u-button> <u-button size="medium" @click="endOrderCancel()">取消</u-button>
<u-button size="medium" type="primary" @click="solutionSubmit()">提交方案</u-button> <u-button size="medium" type="primary" @click="solutionSubmit()">提交方案</u-button>
</view> </view>
<!-- 维修主管审批 巡检 维修方案 --> <!-- 维修主管审批 巡检 维修方案 -->
<view class="repair-btn" style="margin-right: 32rpx;width:100%" <view class="repair-btn" style="margin-right: 32rpx;width:100%"
v-if="dataTypes == 3 && (detailForm.repairStatus == 2 || detailForm.repairStatus == 102) && detailsType == 'repair'"> v-if="dataTypes == 3 && detailForm.repairStatus == 2&&detailsType=='repair'">
<u-button size="medium" @click="endOrderCancel()">取消</u-button> <u-button size="medium" @click="endOrderCancel()">取消</u-button>
<u-button size="medium" type="primary" @click="repairApproveSubmit()">提交</u-button> <u-button size="medium" type="primary" @click="repairApproveSubmit()">提交</u-button>
</view> </view>
<!-- 客户审批 巡检 维修方案 确认是否维修--> <!-- 客户审批 巡检 维修方案 确认是否维修-->
<view class="repair-btn" style="margin-right: 32rpx;width:100%" <view class="repair-btn" style="margin-right: 32rpx;width:100%"
v-if="dataTypes == 1 && detailForm.repairStatus == 3 && detailsType == 'repair'"> v-if="dataTypes == 1 && detailForm.repairStatus == 3&&detailsType=='repair'">
<u-button size="medium" @click="endOrderCancel()">取消</u-button> <u-button size="medium" @click="endOrderCancel()">取消</u-button>
<u-button size="medium" type="primary" @click="customerApproveSubmit()">提交</u-button> <u-button size="medium" type="primary" @click="customerApproveSubmit()">提交</u-button>
</view> </view>
@ -275,12 +257,6 @@ export default {
reservationDisabled() { reservationDisabled() {
return (this.dataTypes == 4 && this.detailForm.taskStatus == 1) || (this.type == 'view') ? true : false return (this.dataTypes == 4 && this.detailForm.taskStatus == 1) || (this.type == 'view') ? true : false
}, },
taskDisabled() {
return (this.dataTypes == 4 && (this.detailForm.taskStatus == 2)) ? false : true
},
priceDisabled(){
return this.dataTypes == 4 && (this.detailForm.repairStatus == 1 || this.detailForm.repairStatus == 101)?false:true
}
}, },
data() { data() {
@ -355,33 +331,19 @@ export default {
this.$u.api.getTaskDetail(query).then(res => { this.$u.api.getTaskDetail(query).then(res => {
if (res.code == 200) { if (res.code == 200) {
this.detailForm = res.data this.detailForm = res.data
this.updateData(res.data.details)
this.collapseData = JSON.parse(JSON.stringify(res.data.details)) this.collapseData = JSON.parse(JSON.stringify(res.data.details))
} }
}) })
} else { } else {
this.$u.api.getRepairDetail(query).then(res => { this.$u.api.getRepairDetail(query).then(res => {
if (res.code == 200) { if (res.code == 200) {
this.detailForm = res.data this.detailForm = res.data
this.updateData(res.data.details)
this.collapseData = JSON.parse(JSON.stringify(res.data.details)) this.collapseData = JSON.parse(JSON.stringify(res.data.details))
} }
}) })
} }
}, },
// 处理数据 更改数据价格为-1的数据
updateData(data) {
if (data.length > 0) {
for (let i = 0; i < data.length; i++) {
data[i].price = data[i].price < 0 ? null : data[i].price
if (data[i].details.length > 0) {
this.updateData(data[i].details)
}
}
}
},
endOrderCancel() { endOrderCancel() {
uni.navigateBack({ uni.navigateBack({
delta: 1 // 默认值是1，表示回退一个页面 delta: 1 // 默认值是1，表示回退一个页面
@ -421,7 +383,7 @@ export default {
sizeType: ["original", "compressed"], // 可以指定是原图还是压缩图，默认二者都有 sizeType: ["original", "compressed"], // 可以指定是原图还是压缩图，默认二者都有
sourceType: ["album", "camera"], // 可以指定来源是相册还是相机，默认二者都有 sourceType: ["album", "camera"], // 可以指定来源是相册还是相机，默认二者都有
success: (res) => { success: (res) => {
this.$refs.BetLoading.show() // this.BetLoading.show()
// 成功选择图片后的回调 // 成功选择图片后的回调
const tempFilePaths = res.tempFilePaths; const tempFilePaths = res.tempFilePaths;
this.uploadFile(tempFilePaths[0], index, vindex, sindex); this.uploadFile(tempFilePaths[0], index, vindex, sindex);
@ -444,11 +406,10 @@ export default {
let info = JSON.parse(res.data); let info = JSON.parse(res.data);
console.log("上传成功", info); // 上传成功后的操作 console.log("上传成功", info); // 上传成功后的操作
this.detailForm.details[index].details[vindex].details[sindex].picUrl = info.data.link this.detailForm.details[index].details[vindex].details[sindex].picUrl = info.data.link
this.itemCollapseChange() // this.BetLoading.hide()
this.$refs.BetLoading.hide()
}, },
error: (uploadFileRes) => { error: (uploadFileRes) => {
this.$refs.BetLoading.hide() // this.BetLoading.hide()
}, },
}); });
}, },
@ -471,16 +432,13 @@ export default {
return false return false
} }
let queryData = [] let queryData = []
console.log(111111111, newArr)
newArr.forEach(item => { newArr.forEach(item => {
// item.id=this.detailForm.id // item.id=this.detailForm.id
queryData.push({ queryData.push({
id: item.id, id: this.detailForm.id,
status: item.status, status: item.status,
signUrl: item.signUrl, signUrl: item.signUrl,
remark: item.remark, remark: item.remark
picUrl: item.picUrl,
taskId: this.detailForm.id
}) })
}) })
this.$u.api.updateDetaile(queryData).then(res => { this.$u.api.updateDetaile(queryData).then(res => {
@ -632,21 +590,19 @@ export default {
let isRepair = newArr.every((item) => { let isRepair = newArr.every((item) => {
return item.isRepair == -1 return item.isRepair == -1
}) })
if (isRepair) {
uni.showToast({ title: "请选择异常设备是否维修", icon: "none" });
return false
}
if (this.customerApproveInfo.approveResult == null) { if (this.customerApproveInfo.approveResult == null) {
uni.showToast({ title: "请选择审核结果", icon: "none" }); uni.showToast({ title: "请选择审核结果", icon: "none" });
return false return false
} }
if (this.customerApproveInfo.approveResult == 1) { if (this.customerApproveInfo.approveResult == 0 && this.customerApproveInfo.approveRemark == '') {
if (isRepair) { uni.showToast({ title: "请填写驳回原因", icon: "none" });
uni.showToast({ title: "请选择异常设备是否维修", icon: "none" }); return false
return false
}
if (this.customerApproveInfo.approveResult == 0 && this.customerApproveInfo.approveRemark == '') {
uni.showToast({ title: "请填写驳回原因", icon: "none" });
return false
}
} }
if (this.customerApproveInfo.approveResult == 1) {//通过 if (this.customerApproveInfo.approveResult == 1) {//通过
let query = { let query = {
task: { task: {
@ -671,14 +627,14 @@ export default {
approveTime: dateFormat("yyyy-MM-dd hh:mm:ss", new Date()),//当前时间 approveTime: dateFormat("yyyy-MM-dd hh:mm:ss", new Date()),//当前时间
approveRemark: this.customerApproveInfo.approveRemark,//审批备注 approveRemark: this.customerApproveInfo.approveRemark,//审批备注
} }
this.$u.api.repairCustomerRefuse(query_).then(res => { // this.$u.api.repairCustomerRefuse(query_).then(res => {
if (res.code == 200) { // if (res.code == 200) {
uni.showToast({ title: "驳回成功", icon: "none" }); // uni.showToast({ title: "审核成功", icon: "none" });
setTimeout(() => { // setTimeout(() => {
this.endOrderCancel() // this.endOrderCancel()
}, 500) // }, 500)
} // }
}) // })
} }
}, },
@ -735,12 +691,6 @@ export default {
}, },
calendarChange(e) { calendarChange(e) {
this.reservationTime = e.result this.reservationTime = e.result
},
// 更改 手风琴的高度
itemCollapseChange() {
this.$nextTick(() => {
this.$refs.collapseTask.init()
})
} }
} }
} }
@ -794,9 +744,8 @@ export default {
} }
.item_right_img { .item_right_img {
width: 140rpx; width: 100%;
height: 140rpx; height: 200rpx;
border-radius: 8rpx;
} }
} }
} }

16
pages/submission/records.vue
Unescape View File

@ -293,20 +293,8 @@ export default {
return sta.includes(item + '') return sta.includes(item + '')
}) })
if(this.dataTypes==2||this.dataTypes==3||this.dataTypes==4){
if(item==100){ return newArr.length<=0?'':newArr[0].name
return '维修驳回'
}
if(item==101){
return '主管驳回'
}
if(item==102){
return '客户驳回'
}
}
return newArr.length<=0?'':newArr[0].name
} }
}, },

8
pages/submission/recordsdetails.vue
Unescape View File

@ -110,13 +110,11 @@
</view> </view>
</view> </view>
<!-- 驳回 --> <!-- 驳回 -->
<view class="repair_detail" v-if="detailForm.status == 100||detailForm.status == 101||detailForm.status == 102"> <view class="repair_detail" v-if="detailForm.repaiRejectReason != ''">
<view class="repair_title" v-if="detailForm.status == 100">维修人员驳回</view> <view class="repair_title">驳回详情</view>
<view class="repair_title" v-if="detailForm.status == 101">主管驳回</view>
<view class="repair_title" v-if="detailForm.status == 102">客户驳回</view>
<view class="detail_item"> <view class="detail_item">
<text class="item_left_txt">驳回原因：</text> <text class="item_left_txt">驳回原因：</text>
<text class="item_right_txt">{{ detailForm.approveRemark }}</text> <text class="item_right_txt">{{ detailForm.repaiRejectReason }}</text>
</view> </view>
</view> </view>

24
pages/submission/sendOrders.vue
Unescape View File

@ -81,19 +81,9 @@
</u-form-item> </u-form-item>
</u-form> </u-form>
</view> </view>
<view class="repair_detail" v-if="detailForm.status == 100 || detailForm.status == 101 || detailForm.status == 102">
<view class="repair_title" v-if="detailForm.status == 100">维修人员驳回</view>
<view class="repair_title" v-if="detailForm.status == 101">主管驳回</view>
<view class="repair_title" v-if="detailForm.status == 102">客户驳回</view>
<u-form labelPosition="left" ref="sendOrderForm" :model="detailForm" :label-width="200" class="repair_form">
<u-form-item label="驳回原因：" prop="customerOpinion" :border-bottom="false">
<view>{{ detailForm.approveRemark }}</view>
</u-form-item>
</u-form>
</view>
<!-- 维修详情 待提交维修方案 展示 --> <!-- 维修详情 待提交维修方案 展示 -->
<view class="repair_detail" <view class="repair_detail"
v-if="(dataTypes == 4 && (detailForm.status == 2 || detailForm.status == 101)) || (dataTypes == 3 && (detailForm.status == 3 || detailForm.status == 102)) || (dataTypes == 1 && detailForm.status == 4)"> v-if="(dataTypes == 4 && (detailForm.status == 2||detailForm.status == 101)) || (dataTypes == 3 && (detailForm.status == 3||detailForm.status == 102)) || (dataTypes == 1 && detailForm.status == 4)">
<view class="repair_title">维修详情</view> <view class="repair_title">维修详情</view>
<u-form labelPosition="left" :rules="repairInfoRules" ref="repairInfoForm" :model="repairInfo" <u-form labelPosition="left" :rules="repairInfoRules" ref="repairInfoForm" :model="repairInfo"
:label-width="140" class="repair_form"> :label-width="140" class="repair_form">
@ -143,7 +133,7 @@
</view> </view>
</view> </view>
<block <block
v-if="(dataTypes == 3 && (detailForm.status == 3 || detailForm.status == 102)) || (dataTypes == 1 && detailForm.status == 4) && repairInfo.isMaterial == 1"> v-if="(dataTypes == 3 && (detailForm.status == 3||detailForm.status == 102)) || (dataTypes == 1 && detailForm.status == 4) && repairInfo.isMaterial == 1">
<u-form-item label="总价:" prop="reportPeople" :border-bottom="false"> <u-form-item label="总价:" prop="reportPeople" :border-bottom="false">
<view>{{ approveInfo.totalPrice }}</view> <view>{{ approveInfo.totalPrice }}</view>
</u-form-item> </u-form-item>
@ -161,7 +151,7 @@
</view> </view>
<!-- 维修负责人 审批 --> <!-- 维修负责人 审批 -->
<view class="repair_detail" v-if="dataTypes == 3 && (detailForm.status == 3 || detailForm.status == 102)"> <view class="repair_detail" v-if="dataTypes == 3 && (detailForm.status == 3||detailForm.status == 102)">
<view class="repair_title">主管审批</view> <view class="repair_title">主管审批</view>
<u-form labelPosition="left" ref="repairInfoForm" :model="approveInfo" :label-width="140" <u-form labelPosition="left" ref="repairInfoForm" :model="approveInfo" :label-width="140"
class="repair_form"> class="repair_form">
@ -208,14 +198,12 @@
<u-button size="medium" type="primary" @click="sendOrderSubmit()">确定派单</u-button> <u-button size="medium" type="primary" @click="sendOrderSubmit()">确定派单</u-button>
</view> </view>
<!-- 维修人员 提交维修方案 --> <!-- 维修人员 提交维修方案 -->
<view class="repair-btn" style="margin-right: 32rpx;width:100%" <view class="repair-btn" style="margin-right: 32rpx;width:100%" v-if="dataTypes == 4 && (detailForm.status == 2||detailForm.status == 101)">
v-if="dataTypes == 4 && (detailForm.status == 2 || detailForm.status == 101)">
<u-button size="medium" @click="endOrderCancel()">取消</u-button> <u-button size="medium" @click="endOrderCancel()">取消</u-button>
<u-button size="medium" type="primary" @click="servicemanSubmit()">提交</u-button> <u-button size="medium" type="primary" @click="servicemanSubmit()">提交</u-button>
</view> </view>
<!-- 维修负责人 审批 --> <!-- 维修负责人 审批 -->
<view class="repair-btn" style="margin-right: 32rpx;width:100%" <view class="repair-btn" style="margin-right: 32rpx;width:100%" v-if="dataTypes == 3 && detailForm.status == 102">
v-if="dataTypes == 3 && detailForm.status == 102">
<u-button size="medium" @click="endOrderCancel()">取消</u-button> <u-button size="medium" @click="endOrderCancel()">取消</u-button>
<u-button size="medium" type="primary" @click="approveSubmit()">提交</u-button> <u-button size="medium" type="primary" @click="approveSubmit()">提交</u-button>
</view> </view>
@ -295,7 +283,7 @@ export default {
return this.$store.state.dataType == 2 ? false : true return this.$store.state.dataType == 2 ? false : true
}, },
optionDisabled() { optionDisabled() {
return (this.$store.state.dataType == 3 && (this.detailForm.status == 3 || this.detailForm.status == 102)) || (this.$store.state.dataType == 1 && this.detailForm.status == 4) ? true : false return (this.$store.state.dataType == 3 && (this.detailForm.status == 3||this.detailForm.status == 102)) || (this.$store.state.dataType == 1 && this.detailForm.status == 4) ? true : false
}, },
}, },

4
utils/website.js
Unescape View File

@ -3,9 +3,9 @@
*/ */
export default { export default {
// baseUrl: 'http://124.221.142.15:8088/lab', // baseUrl: 'http://124.221.142.15:8088/lab',
// baseUrl:'http://192.168.0.118:80', //李庆坤 baseUrl:'http://192.168.0.118:80', //李庆坤
// baseUrl:'http://192.168.0.109:80', //李涛 // baseUrl:'http://192.168.0.109:80', //李涛
baseUrl:'http://192.168.1.12:80', //远程地址 // baseUrl:'http://192.168.1.12:80', //李涛
indexTitle: "科研医疗建筑运维平台", indexTitle: "科研医疗建筑运维平台",
clientId: "saber", // 客户端id clientId: "saber", // 客户端id
clientSecret: "saber_secret", // 客户端密钥 clientSecret: "saber_secret", // 客户端密钥

Write Preview
Loading…
Cancel
Save