hailu
2023-11-23 43dde6e16041705356e5828c2dff8d0c34c6eafb
结单
7个文件已修改
197 ■■■■ 已修改文件
GoldC/pages/Remind/Remind.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
GoldC/pages/home/home.js 42 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
GoldC/pages/problemList/problemList.js 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
GoldC/pages/problemList/problemList.wxml 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
GoldC/pages/problemReport/proRep.js 71 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
GoldC/pages/problemReport/proRep.json 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
GoldC/pages/problemReport/proRep.wxml 60 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
GoldC/pages/Remind/Remind.js
@@ -1,5 +1,5 @@
// pages/Remind/Remind.js
import { BackLog, TOperation } from '../../utils/network'
// import { BackLog, TOperation } from '../../utils/network'
const app = getApp()
Page({
GoldC/pages/home/home.js
@@ -1,5 +1,5 @@
// pages/home/home.js
import {BackLog,GetManagementClass,GetCompany,GetArea} from '../../utils/network'
// import {BackLog,GetManagementClass,GetCompany,GetArea} from '../../utils/network'
const app = getApp()
Page({
@@ -10,7 +10,7 @@
    showone: false,
    showtwo: false,
    newsnum:0,
    roleKey:wx.getStorageSync('roleKey')
    roleKey:'',
  },
  // 跳转到问题列表 (管理员)
  toProblemList() {
@@ -33,7 +33,7 @@
   * 生命周期函数--监听页面加载
   */
  onLoad: function (options) {
    console.log(this.data.roleKey);
    var user = wx.getStorageSync('user')
    switch (user.RoleValue) {
      case 1:
@@ -86,6 +86,10 @@
   * 生命周期函数--监听页面显示
   */
  onShow: function () {
    this.setData({
      roleKey:wx.getStorageSync('roleKey')
    })
    var user = wx.getStorageSync('user')
    switch (user.RoleValue) {
@@ -120,37 +124,7 @@
        })
        break;
    }
    // 待办提醒
    BackLog(1).then((res)=>{
      if (res.data.TimeOutFlag){
        wx.removeStorage({
          key: 'user',
          success() {
                wx.setStorageSync('token', '')
                wx.redirectTo({
                  url: '/pages/login/logn',
                })
              }
        })
        wx.showToast({
          title: '登录超时,您已下线',
        })
      } else {
        // console.log(res.data)
        if(res.data.Data){
          var numOne = res.data.Data.length
          app.tixingtag1 = numOne
        }
        BackLog(2).then((res)=>{
          if(res.data.Data){
            app.tixingtag2 = res.data.Data.length
            this.setData({
              newsnum:res.data.Data.length+numOne
            })
          }
        })
      }
    })
  },
  /**
GoldC/pages/problemList/problemList.js
@@ -12,7 +12,7 @@
    nextlevel: 0,
    showTabs: false,
    erectoListLevel: [],
    state: -1,
    state: 0,
    listdata: [],
    active1: 0,
    active2: 0,
@@ -275,6 +275,14 @@
    this.getErectoListLevel()
    this.getList()
  },
  statements(e){
    console.log(e);
    var item=e.currentTarget.dataset.base
    wx.navigateTo({
      url: '/pages/problemReport/proRep?info='+JSON.stringify(item),
    })
  },
  /**
   * 生命周期函数--监听页面隐藏
GoldC/pages/problemList/problemList.wxml
@@ -17,7 +17,7 @@
        </view>
    </view>
</view> -->
<view wx:if="{{showTabs}}">
<view wx:if="{{roleKey!='tenantservice'}}">
  <van-tabs active="{{ active2 }}" bind:change="changeActive2">
    <van-tab title="本级">
    </van-tab>
@@ -141,7 +141,7 @@
  <!-- 待审核 -->
  <van-tab title="已接单">
    <view class="listBox">
      <view class="list" wx:for="{{listdata}}">
      <view class="list" wx:for="{{listdata}}"  wx:for-item='item'>
        <view class="heard">
          <view class="htext">{{item.device.deviceName}}</view>
        </view>
@@ -177,9 +177,9 @@
        <view class="footer">
          <view class="libtn">
            <!-- 修改 -->
            <view class="btn btn-adit" bindtap="adit" data-id="{{item.pk_Examine}}">
            <view class="btn btn-adit"  data-id="{{item.pk_Examine}}" data-base='{{item}}' bind:tap="statements">
              <van-icon name="edit" class="icon" />
              <text>修改</text>
              <text>结单</text>
            </view>
          </view>
          <view class="libtn">
@@ -195,7 +195,7 @@
  <!-- 已完成 -->
  <van-tab title="已完成">
    <view class="listBox">
      <view class="list" wx:for="{{listdata}}">
      <view class="list" wx:for="{{listdata}}" wx:for-item='item'>
        <view class="heard">
          <view class="htext">{{item.device.deviceName}}</view>
        </view>
GoldC/pages/problemReport/proRep.js
@@ -9,6 +9,7 @@
   * 页面的初始数据
   */
  data: {
    imageUrl: [],
    form: {
      deviceId: undefined,
      address: '',//地址
@@ -37,14 +38,37 @@
    minute: '',//选择的分
    showDate: false,
    selectDate: '',
    paramsInfo: {},
    showJD: false,
  },
  /**
   * 生命周期函数--监听页面加载
   */
  onLoad: function (options) {
    this.getErectoList()
    this.getDeviceList()
    if (options) {
      let info = JSON.parse(options.info)
      info.state = 3
      this.setData({
        showJD: true,
        paramsInfo: info,
        form: info,
        time: info.appointmentTime,
        deviceIndex: 0,
        deviceList2: [info.device.deviceName],
        erectoIndex: 0,
        erectoList2: [info.erectoName]
      })
      wx.setNavigationBarTitle({
        title:this.data.form.device.deviceName
      })
      console.log(this.data);
    } else {
      this.getErectoList()
      this.getDeviceList()
    }
  },
  getDeviceList() {
    let data = {
@@ -59,7 +83,6 @@
      },
      params: data,
      success: (res, header) => {
        if (res.data.code != 200) {
          wx.showToast({
            title: res.data.msg,
@@ -346,26 +369,28 @@
   * 生命周期函数--监听页面显示
   */
  onShow: function () {
    var loadPickerData = DatePickerUtil.loadPickerData()
    var getCurrentDate = DatePickerUtil.getCurrentDate()
    var GetMultiIndex = DatePickerUtil.GetMultiIndex()
    if (!this.data.showJD) {
      var loadPickerData = DatePickerUtil.loadPickerData()
      var getCurrentDate = DatePickerUtil.getCurrentDate()
      var GetMultiIndex = DatePickerUtil.GetMultiIndex()
      //这里写的是为了记录当前时间
      let year = parseInt(getCurrentDate.substring(0, 4));
      let month = parseInt(getCurrentDate.substring(5, 7));
      let day = parseInt(getCurrentDate.substring(8, 10));
      let hour = parseInt(getCurrentDate.substring(11, 13));
      let minute = parseInt(getCurrentDate.substring(14, 16));
      this.setData({
        multiArray: loadPickerData,//picker数组赋值,格式 [years, months, days, hours, minutes]
        multiIndex: GetMultiIndex,//设置pickerIndex,[0,0,0,0,0]
        time: getCurrentDate.replace('年', '-').replace('月', '-').replace('日', ' '), //设置当前时间 ,currentYears+'-'+mm+'-'+dd+' '+hh+':'+min
        year: year,//记录选择的年
        month: month,//记录选择的月
        day: day,//记录选择的日
        hour: hour,//记录选择的时
        minute: minute,//记录选择的分
      });
    }
    //这里写的是为了记录当前时间
    let year = parseInt(getCurrentDate.substring(0, 4));
    let month = parseInt(getCurrentDate.substring(5, 7));
    let day = parseInt(getCurrentDate.substring(8, 10));
    let hour = parseInt(getCurrentDate.substring(11, 13));
    let minute = parseInt(getCurrentDate.substring(14, 16));
    this.setData({
      multiArray: loadPickerData,//picker数组赋值,格式 [years, months, days, hours, minutes]
      multiIndex: GetMultiIndex,//设置pickerIndex,[0,0,0,0,0]
      time: getCurrentDate.replace('年', '-').replace('月', '-').replace('日', ' '), //设置当前时间 ,currentYears+'-'+mm+'-'+dd+' '+hh+':'+min
      year: year,//记录选择的年
      month: month,//记录选择的月
      day: day,//记录选择的日
      hour: hour,//记录选择的时
      minute: minute,//记录选择的分
    });
  },
  /**
GoldC/pages/problemReport/proRep.json
@@ -1,6 +1,6 @@
{
  "usingComponents": {
  },
  "navigationBarTitleText": "安装下单"
}
GoldC/pages/problemReport/proRep.wxml
@@ -6,7 +6,7 @@
    <image class="primg" src="/images/ProRep/pingding.png"></image>
    <view>设备</view>
  </view>
  <picker bindchange="bindPicker" value="{{deviceIndex}}" range="{{deviceList2}}">
  <picker bindchange="bindPicker" value="{{deviceIndex}}" range="{{deviceList2}}" disabled='{{showJD}}'>
    <view class="chose">{{deviceList2[deviceIndex]?deviceList2[deviceIndex]:'请选择设备'}}</view>
  </picker>
</view>
@@ -17,7 +17,7 @@
    <image class="primg" src="/images/ProRep/name.png"></image>
    <view>安装工</view>
  </view>
  <picker bindchange="bindPicker2" value="{{erectoIndex}}" range="{{erectoList2}}">
  <picker bindchange="bindPicker2" value="{{erectoIndex}}" range="{{erectoList2}}" disabled='{{showJD}}'>
    <view class="chose">{{erectoList2[erectoIndex]?erectoList2[erectoIndex]:'请选择安装工'}}</view>
  </picker>
</view>
@@ -27,20 +27,26 @@
    <image class="primg" src="/images/ProRep/gongsixiangmu.png"></image>
    <view>状态</view>
  </view>
  <radio-group bindchange="radioChange">
  <!-- <radio-group bindchange="radioChange"> -->
    <label>
      <radio value="0" checked="true">未指派</radio>
      <radio value="0" checked="{{form.state==0}}" disabled='{{showJD}}'>未指派</radio>
    </label>
    <label>
      <radio value="1">已派单</radio>
      <radio value="1" checked="{{form.state==1}}" disabled='{{showJD}}'>已派单</radio>
    </label>
    <label>
      <radio value="2">已接单</radio>
      <radio value="2" checked="{{form.state==2}}" disabled='{{showJD}}'>已接单</radio>
    </label>
    <label>
      <radio value="3">已完成</radio>
      <radio value="3" checked="{{form.state==3}}" disabled='{{showJD}}'>已完成</radio>
    </label>
  </radio-group>
  <!-- </radio-group> -->
  <!-- <van-radio-group value="{{ from.state }}"  direction="horizontal">
    <van-radio name="0">未指派</van-radio>
    <van-radio name="1">已派单</van-radio>
    <van-radio name="2">已接单</van-radio>
    <van-radio name="3">已完成</van-radio>
  </van-radio-group> -->
</view>
<view>
@@ -48,21 +54,21 @@
    <image class="primg" src="/images/ProRep/uptext.png"></image>
    <view>用户姓名</view>
  </view>
  <input bindinput="shangbao" class="textbox" placeholder="请输入用户姓名"></input>
  <input bindinput="shangbao" value="{{form.userName}}" class="textbox" placeholder="请输入用户姓名"></input>
</view>
<view>
  <view class="title">
    <image class="primg" src="/images/ProRep/uptext.png"></image>
    <view>手机号</view>
  </view>
  <input bindinput="shangbao" class="textbox" placeholder="请输入手机号"></input>
  <input bindinput="shangbao" value="{{form.userPhone}}" class="textbox" placeholder="请输入手机号"></input>
</view>
<view>
  <view class="title">
    <image class="primg" src="/images/ProRep/uptext.png"></image>
    <view>安装地址</view>
  </view>
  <input bindinput="shangbao" class="textbox" placeholder="请输入安装地址"></input>
  <input bindinput="shangbao" value="{{form.address}}" class="textbox" placeholder="请输入安装地址"></input>
</view>
<view>
@@ -72,9 +78,7 @@
  </view>
  <view bind:tap="openShowDate">
    <picker bindtap="clickSelectTime" mode="multiSelector" bindchange="bindMultiPickerChange" bindcolumnchange="bindMultiPickerColumnChange" value="{{multiIndex}}" range="{{multiArray}}">
      <view style="width: 96%;margin-left: 2%;height: 40px;background: #FFFFFF;line-height: 40px;color: #A18080;">{{time}}</view>
      <!-- <view class="triangle_border_down"> </view> -->
      <!-- <input :value="{{time}}" class="textbox" placeholder="请输入预约时间"></input> -->
      <view style="width: 96%;margin-left: 2%;height: 40px;background: #FFFFFF;line-height: 40px;color: #A18080;">{{time}}</view>
    </picker>
  </view>
</view>
@@ -84,33 +88,25 @@
    <image class="primg" src="/images/ProRep/uptext.png"></image>
    <view>备注</view>
  </view>
  <textarea bindinput="shangbao" class="textbox" placeholder="请输入备注内容..."></textarea>
  <textarea bindinput="shangbao" class="textbox" value="{{form.remark}}" placeholder="请输入备注内容..."></textarea>
</view>
<!-- 录入备注 -->
<!-- <view style="display:none">
  <view class="title">
    <image class="primg" src="/images/ProRep/beizhu.png"></image>
    <view>录入备注</view>
  </view>
  <textarea bindinput="beizhu" class="textbox" placeholder="请输入上报备注内容..."></textarea>
</view> -->
<!-- 上传图片 -->
<view style="display:none">
<view>
  <view class="title">
    <image class="primg" src="/images/ProRep/imgicon.png"></image>
    <view>上传照片</view>
  </view>
  <view class="photoBox">
    <view wx:for="{{imageUrl}}" style="display:inline" class="upimgbox">
      <image class="upphotoimg" src="{{item}}" mode="aspectFill" style="margin-right:15rpx"></image>
      <image class="removeimg" src="/images/del.png" bindtap="removeimg" data-index="{{index}}"></image>
    </view>
    <!-- <image wx:if="{{imageUrl}}" class="upphotoimg" src="{{imageUrl}}" mode="aspectFill" bindtap="chooseImage"></image> -->
    <image wx:if="{{imageUrl.length<2}}" class="upphotoimg" src="/images/img.png" mode="aspectFill" bindtap="chooseImage"></image>
    <view>尺寸在512*512以内,大小在500kb以内</view>
  </view>
        <view wx:for="{{imageUrl}}" style="display:inline" class="upimgbox">
            <image class="upphotoimg" src="{{item}}" mode="aspectFill" style="margin-right:15rpx"></image>
            <image class="removeimg" src="/images/del.png" bindtap="removeimg" data-index="{{index}}"></image>
        </view>
        <image wx:if="{{imageUrl.length<2}}" class="upphotoimg" src="/images/img.png" mode="aspectFill" bindtap="chooseImage"></image>
        <view>尺寸在512*512以内,大小在500kb以内</view>
    </view>
</view>
<!-- <view class="addressBtn" bindtap="openBaiduMap">打开百度地图</view> -->