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

测试问题修改

Browse Source
test
zhangdi 1 year ago
parent 2a68026277
commit 5a470cbf3f
5 changed files with 96 additions and 51 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. 46
      common/betone_components/betone-list.vue
  2. 2
      pages/home/components/swiper.vue
  3. 5
      pages/home/index.vue
  4. 24
      pages/inspection/quest.vue
  5. 20
      pages/submission/sendOrders.vue

46
common/betone_components/betone-list.vue
Unescape View File

@ -81,7 +81,7 @@
@click.stop="openWorkOrder(item)">查看</u-button> @click.stop="openWorkOrder(item)">查看</u-button>
<u-button v-if="item.status == 1" size="mini" :plain="true" style="margin-right: 32rpx" <u-button v-if="item.status == 1" size="mini" :plain="true" style="margin-right: 32rpx"
type="primary" @click="orderConfirm(item)">确认</u-button> type="primary" @click="openModel(item,'submitOrder')">确认</u-button>
<u-button v-if="item.status == 1" size="mini" :plain="true" style="margin-right: 32rpx" <u-button v-if="item.status == 1" size="mini" :plain="true" style="margin-right: 32rpx"
type="primary" @click="openModel(item, 'turn')">驳回</u-button> type="primary" @click="openModel(item, 'turn')">驳回</u-button>
<u-button v-if="item.status == 2" size="mini" :plain="true" style="margin-right: 32rpx" <u-button v-if="item.status == 2" size="mini" :plain="true" style="margin-right: 32rpx"
@ -127,6 +127,12 @@
请确认付款是否已经完成？ 请确认付款是否已经完成？
</view> </view>
</betone-modal> </betone-modal>
<!-- 维修人员确认接单 -->
<betone-modal v-model="submitOrderShow" :title="'提示'" @confirm="submitOrderShowFn" @cancel="submitOrderShow = false">
<view class="modal-text">
请确认是否进行接单？
</view>
</betone-modal>
<betone-loading ref="BetLoading" /> <betone-loading ref="BetLoading" />
</view> </view>
@ -152,12 +158,20 @@ export default {
reportUnit: '',//提报单位 reportUnit: '',//提报单位
}, },
tagColor: { tagColor: {
维修中: "#3A62D7", 待提报: "#409eff",
待确认: "#81B337", 待接单: "#67c23a",
待维修: "#3A62D7", 待维修: " #409eff",
待提报: "#81B337", 确认方案: "#409eff",
待维修: '#E99D42', 维修中: '#e6a23',
已完成: "#CECECE", 待评价:"#67c23a",
待付款:"#67c23a",
维修中:"#e6a23",
已驳回:"#f56c6c",
待审批:"#409eff",
已通过:"#409eff",
待确认:"#67c23a",
待提交:'#67c23a',
已完成: "#909399",
}, },
current: 0, current: 0,
@ -184,6 +198,8 @@ export default {
repairShow: false,//维修人员 去人维修完成弹框 repairShow: false,//维修人员 去人维修完成弹框
paymentShow: false,//客服确付款 paymentShow: false,//客服确付款
submitOrderShow:false,//维修人员确认接单
}; };
}, },
computed: { computed: {
@ -432,6 +448,9 @@ export default {
if (type == 'paymentInfo') { if (type == 'paymentInfo') {
this.paymentShow = true this.paymentShow = true
} }
if (type == 'submitOrder') {
this.submitOrderShow = true
}
this.rowInfo = item this.rowInfo = item
}, },
@ -525,6 +544,19 @@ export default {
this.$u.api.cloneOrder(query).then(res => { this.$u.api.cloneOrder(query).then(res => {
this.paymentShow = false this.paymentShow = false
this.BetLoading.hide(); this.BetLoading.hide();
if (res.code == 200) {
uni.showToast({ title: "确认成功", icon: "none" });
this.submitOrderShow = false
this.getRecordsList()
}
})
},
// 维修人员确认接单
submitOrderShowFn(){
let query_ = {
id: this.rowInfo.id
}
this.$u.api.servicemanReceive(query_).then(res => {
if (res.code == 200) { if (res.code == 200) {
uni.showToast({ title: "确认成功", icon: "none" }); uni.showToast({ title: "确认成功", icon: "none" });
this.getRecordsList() this.getRecordsList()

2
pages/home/components/swiper.vue
Unescape View File

@ -81,7 +81,7 @@ export default {
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;
color: rgba(34, 34, 34, 0.5); color: rgba(34, 34, 34, 0.5);
height: 260rpx; height: 210rpx;
display: flex; display: flex;
align-items: center; align-items: center;
flex: 1; flex: 1;

5
pages/home/index.vue
Unescape View File

@ -111,9 +111,14 @@ export default {
}) })
}, },
goPage(item) { goPage(item) {
if (item.pagePath == '') {
uni.showToast({ title: "功能正在完善中，敬请期待！", icon: "none" });
} else {
uni.navigateTo({ uni.navigateTo({
url: item.pagePath, url: item.pagePath,
}); });
}
}, },
scanCode() { scanCode() {
uni.scanCode({ uni.scanCode({

24
pages/inspection/quest.vue
Unescape View File

@ -67,8 +67,8 @@
</block> </block>
<!--巡检维修 客服 --> <!--巡检维修 客服 -->
<block v-if="subsectionCurrent == '1' && dataTypes == 2"> <block v-if="subsectionCurrent == '1' && dataTypes == 2">
<u-button v-if="item.repairStatus == 6" size="mini" plain <u-button v-if="item.repairStatus == 6" size="mini" plain style="margin-right: 32rpx"
style="margin-right: 32rpx" @click.stop="openModel(item, 'paymentInfo')">确认付款</u-button> @click.stop="openModel(item, 'paymentInfo')">确认付款</u-button>
</block> </block>
<!--巡检维修 维修主管 --> <!--巡检维修 维修主管 -->
<block v-if="subsectionCurrent == '1' && dataTypes == 3"> <block v-if="subsectionCurrent == '1' && dataTypes == 3">
@ -96,7 +96,8 @@
value-name="id" title="选择维修人员"></u-select> value-name="id" title="选择维修人员"></u-select>
<!-- 维修人员 确认维修是否完成 --> <!-- 维修人员 确认维修是否完成 -->
<betone-modal v-model="repairCompleteShow" :title="'提示'" @confirm="repairCompleteFn" @cancel="repairCompleteShow = false"> <betone-modal v-model="repairCompleteShow" :title="'提示'" @confirm="repairCompleteFn"
@cancel="repairCompleteShow = false">
维修是否完成？ 维修是否完成？
</betone-modal> </betone-modal>
@ -129,12 +130,19 @@ export default {
userInfo: {},//用户信息 userInfo: {},//用户信息
rowInfo: {},//选中行数据 rowInfo: {},//选中行数据
tagColor: { tagColor: {
维修中: "#3A62D7", 待巡检: "#67c23a",
待确认: "#81B337", 巡检中: "#e6a23",
待维修: "#3A62D7", 待确认: '#67c23a',
待提报: "#81B337", 待派单: "#409eff",
待接单: "#67c23a",
已完成: "#CECECE", 已完成: "#CECECE",
待维修: '#E99D42' 待提交: "#67c23a",
待审批 :"#409eff",
维修中:"#e6a23",
待确认:"#67c23a",
待评价:"#67c23a",
维修完成:"#67c23a",
待付款:"#67c23a",
}, },
tabList: [], tabList: [],
tasktabList: [], tasktabList: [],

20
pages/submission/sendOrders.vue
Unescape View File

@ -5,11 +5,11 @@
<u-form labelPosition="left" :rules="rules" ref="repairDetailsForm" :model="repairDetails" <u-form labelPosition="left" :rules="rules" ref="repairDetailsForm" :model="repairDetails"
:label-width="200" class="repair_form"> :label-width="200" class="repair_form">
<u-form-item label="需求单号:" prop="requirementCode" :border-bottom="false"> <u-form-item label="需求单号:" prop="requirementCode" :border-bottom="false">
<betone-new-input label="" v-model="repairDetails.requirementCode" placeholder="请输入" <betone-new-input label="" v-model="repairDetails.requirementCode" placeholder=""
:disabled="true" /> :disabled="true" />
</u-form-item> </u-form-item>
<u-form-item label="提报单位:" prop="reportUnit" :border-bottom="false"> <u-form-item label="提报单位:" prop="reportUnit" :border-bottom="false">
<betone-new-input label="" v-model="repairDetails.reportUnit" placeholder="请输入" :disabled="true" /> <betone-new-input label="" v-model="repairDetails.reportUnit" placeholder="" :disabled="true" />
</u-form-item> </u-form-item>
<u-form-item label="故障现象描述:" prop="faultDescribe" :border-bottom="false"> <u-form-item label="故障现象描述:" prop="faultDescribe" :border-bottom="false">
<betone-new-input label="" v-model="repairDetails.faultDescribe" placeholder="请输入" <betone-new-input label="" v-model="repairDetails.faultDescribe" placeholder="请输入"
@ -54,13 +54,13 @@
:disabled="disabled" type="textarea" :height="120" /> :disabled="disabled" type="textarea" :height="120" />
</u-form-item> </u-form-item>
<u-form-item v-if="dataTypes == 4" label="是否申领物料:" prop="isNeedMaterials" :border-bottom="false" <!-- <u-form-item v-if="dataTypes == 4" label="是否申领物料:" prop="isNeedMaterials" :border-bottom="false"
:label-width="200" :isRequire="true"> :label-width="200" :isRequire="true">
<uni-data-checkbox v-model="sendOrder.isNeedMaterials" <uni-data-checkbox v-model="sendOrder.isNeedMaterials"
:localdata="isMaterialList"></uni-data-checkbox> :localdata="isMaterialList"></uni-data-checkbox>
</u-form-item> </u-form-item> -->
<view class="selectForm clearfix" v-if="sendOrder.isNeedMaterials == 1"> <!-- <view class="selectForm clearfix" v-if="sendOrder.isNeedMaterials == 1">
<view class="form-item form-label">物料申领:</view> <view class="form-item form-label">物料申领:</view>
<view class="form-item form-content"> <view class="form-item form-content">
<view class="select-box clearfix"> <view class="select-box clearfix">
@ -76,11 +76,11 @@
<u-button size="medium" :plain="true" style="margin-right: 32rpx;width:100%" type="primary" <u-button size="medium" :plain="true" style="margin-right: 32rpx;width:100%" type="primary"
@click="goodsSelect()">{{ sendOrder.materialsData.length > 0 ? '修改' : '添加' }}</u-button> @click="goodsSelect()">{{ sendOrder.materialsData.length > 0 ? '修改' : '添加' }}</u-button>
</view> </view>
</view> </view> -->
<u-form-item v-if="dataTypes == 4" label="备注:" prop="remark" :border-bottom="false"> <!-- <u-form-item v-if="dataTypes == 4" label="备注:" prop="remark" :border-bottom="false">
<u-input v-model="sendOrder.remark" type="textarea" :border="true" :height="120" /> <u-input v-model="sendOrder.remark" type="textarea" :border="true" :height="120" />
</u-form-item> </u-form-item> -->
</u-form> </u-form>
</view> </view>
@ -198,12 +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-4-btn" style="margin-right: 32rpx;width:100%" <!-- <view class="repair-4-btn" style="margin-right: 32rpx;width:100%"
v-if="dataTypes == 4 && detailForm.status == 1"> v-if="dataTypes == 4 && detailForm.status == 1">
<u-button size="medium" @click="endOrderCancel()">取消</u-button> <u-button size="medium" @click="endOrderCancel()">取消</u-button>
<u-button size="medium" @click="turnShow = true">驳回</u-button> <u-button size="medium" @click="turnShow = true">驳回</u-button>
<u-button size="medium" type="primary" @click="repairOrderSubmit()">确认接单</u-button> <u-button size="medium" type="primary" @click="repairOrderSubmit()">确认接单</u-button>
</view> </view> -->
<!-- 维修人员 提交维修方案 --> <!-- 维修人员 提交维修方案 -->
<view class="repair-btn" style="margin-right: 32rpx;width:100%" v-if="dataTypes == 4 && detailForm.status == 2"> <view class="repair-btn" style="margin-right: 32rpx;width:100%" v-if="dataTypes == 4 && detailForm.status == 2">
<u-button size="medium" @click="endOrderCancel()">取消</u-button> <u-button size="medium" @click="endOrderCancel()">取消</u-button>

Write Preview
Loading…
Cancel
Save