提交

liuwh

2020-03-25 ec511e31e01a195bfea5145f9e7e929a68cd9f7e

提交

 SunshineIns/src/page/ActiveManageEdit.jsx

@@ -728,6 +728,12 @@
                                                <Modal visible={previewVisible} footer={null} onCancel={this.handleCancel}>
                                                    <img alt="example" style={{ width: '100%' }} src={previewImage} />
                                                </Modal>
                                            </Col>
                                        </Row>
                                        <Row type="flex" align='top' justify="space-around">
                                            <Col span={6} pull={0} style={{ textAlign: 'center' }}><span>培训结果</span></Col>
                                            <Col span={18} push={0} >
                                                <span>{savedate.result}</span>
                                            </Col>
                                        </Row>
                                    </div>

 SunshineIns/src/page/ApplyForEdit.jsx

@@ -69,7 +69,7 @@
                    },
                    disabled: res.status ? true : false,
                    loading: false,
                    fileList: res.list ? res.list.map((item, index) => ({ uid: index, id: item.id, name: item.name, status: 'done', url: domain + `/api/v1/attachment/download/${item.id}?online=false` })) : []
                    fileList: res.list ? res.list.map((item, index) => ({ uid: item.uid, id: item.uid, name: item.name, status: 'done', url: domain + `/api/v1/attachment/download/${item.uid}?online=false` })) : []
                });

            })
@@ -242,6 +242,7 @@
            },
            fileList: fileList,
            onDownload: (file) => {
                console.log(file)
                Fetch.attachmentDownload(file.uid)
                    .then(res => {
                        message.success("下载成功！");

 SunshineIns/src/page/ArticleEidt.jsx

@@ -89,6 +89,10 @@
    const list = this.state.selectedRow.map(({ id }) => id);
    const { savedate } = this.state;
    savedate.list = list;
    if (!savedate.channelIdd) {
      message.warning("请选择信息分类");
      return;
    }
    Fetch.saveArticle(savedate)
      .then(res => {
        if (res.statuscode === 1) {

 SunshineIns/src/page/LawSubscribe.jsx

@@ -141,7 +141,7 @@
              <Divider type="vertical" />
            </span> : null
          }
          <label className='theme-color' onClick={() => this.onClick(record.id, 'see')} style={{ cursor: 'pointer' }}>查看</label>
          <label className='theme-color' onClick={() => this.onClick(record.id, 'do')} style={{ cursor: 'pointer' }}>查看</label>
        </span>
      ),
    }];

 SunshineIns/src/page/LawSubscribeDetail.jsx

@@ -176,7 +176,7 @@
              </LineView>
              : null}
          {flag == "do" ?
            (data.status == 1 ? (
            (data.status ? (
              <LineView title="回复" lineHeight="50px">
                <table>
                  <tbody>

 SunshineIns/src/page/NoInspectionReportDetail.jsx

@@ -11,6 +11,7 @@
import LineView from "../view/LineView";
import HeadView from "../view/HeadView";
import Fetch from "../fetch";
import {domain} from "../fetch/_fetch";
const { TextArea } = Input;
const replyAdmin = {
  display: 'block',
@@ -116,12 +117,10 @@
                  <tr>
                    <td className="table-vaule1">举报对象</td>
                    <td className="table-vaule2">{detail.tipoffObject}</td>
                    <td className="table-vaule3">举报行为</td>
                    <td className="table-vaule4">{detail.tipoffAction}</td>
                  </tr>
                  <tr>
                    <td className="table-vaule1">发生地</td>
                    <td className="table-vaule2">{detail.tipoffAddress}</td>
                  </tr>
                  <tr>
                    <td className="table-vaule3">举报类型</td>
                    <td className="table-vaule4">{businessType(detail.tipoffType)}</td>
                  </tr>
@@ -159,10 +158,10 @@
                  (
                    data.type != 21 ?
                      < div style={{ marginRight: "10px" }} key={key}>
                        <a href={data.path} target='_black'> <img src={data.path} width='70' height='70' /></a>
                        <a href={domain + 'api/v1/attachment/image/'+data.id} target='_black'> <img src={domain + 'api/v1/attachment/image/'+data.id} width='70' height='70' /></a>
                      </div>
                      : < div style={{ marginRight: "10px" }} key={key}>
                        <a href={data.path} target='_black'><video src={data.path} width='70' height='70'></video></a>
                        <a href={domain + 'api/v1/attachment/image/'+data.id} target='_black'><video src={domain + 'api/v1/attachment/image/'+data.id} width='70' height='70'></video></a>
                      </div>
                  )
                ))
@@ -250,3 +249,5 @@
      return '暂无';
  }
}



 SunshineIns/src/page/QuestionDetail.jsx

@@ -106,7 +106,7 @@
                      问卷描述：{initData.content || '暂无'}
                    </h4>
                    <h4 style={{ marginBottom: 0 }}>
                      业务类型：{initData.businessType || '暂无'}
                      业务类型：{typeStatus(  ) || '暂无'}
                    </h4>
                  </div>
                </div>
@@ -123,3 +123,16 @@
  }

}

function typeStatus(type) {
  switch (type) {
    case 1:
      return "企业体检";
    case 2:
      return "培训活动";
    case 3:
      return "未检调查";
    case 4:
      return "刑执监督";
  }
}

 SunshineLnsMinApp/app.js

@@ -10,8 +10,8 @@
  globalData: {
    userInfo: null,
    pageData: {},
    url: 'https://nsjcy.hugeinfo.com.cn/nsjc-charge',
    // url: 'http://1p885086k1.iok.la/nsjc-charge',
    // url: 'https://nsjcy.hugeinfo.com.cn/nsjc-charge',
    url: 'http://1p885086k1.iok.la/nsjc-charge',
    // url: 'http://192.168.0.31:8085/nsjc-charge',
    imgUrl: 'https://nsjcy.hugeinfo.com.cn/nsjc-charge',
    // url: 'http://nsjc.vaiwan.com/nsjc-charge',

 SunshineLnsMinApp/pages/fzpxInfo/fzpxInfo.js

@@ -9,12 +9,14 @@
   * 页面的初始数据
   */
  data: {
    user: app.globalData.imgUrl + '/image/user.svg',
    loading: false,
    peopleInfo: {},
    signStatus: '',
    id: "",
    topattList:[],
    bottomattList:[]
    bottomattList: [],
    statequeId: ''
  },

  /**
@@ -41,6 +43,17 @@
        wx.hideLoading();
        if (res.data.code == 0) {
          res.data.data.startTime = app.formatDate(res.data.data.startTime)
          if (res.data.data.activityStatus == 3) {
            if (res.data.data.queId) {
              that.setData({
                statequeId: res.data.data.queId
              })
            }
          } else {
            that.setData({
              statequeId: ''
            })
          }
          that.setData({
            activity: res.data.data,
            bottomattList:res.data.data.attList.filter((item)=>(item.associateType==1020)),
@@ -53,7 +66,8 @@
            that.setData({
              signStatus: options.signStatus
            })
          } else {sign
          } else {
            sign
            if (options.flag == 'true') {
              //可报名
              console.log('可报名')
@@ -114,6 +128,14 @@
    })
  },

  //跳转问卷调查
  businessSchedule: function(e) {
    var id = e.currentTarget.dataset['id'];
    wx.navigateTo({
      url: '/pages/createSub/createSub?id=' + id,
    })
  },

  inputChange: function (e) {
    var name = e.currentTarget.dataset.name;
    this.setData({

 SunshineLnsMinApp/pages/fzpxInfo/fzpxInfo.wxml

@@ -36,7 +36,8 @@
            <view class="fzpxInfo-main-group">
                <view class="fzpxInfo-main-group-title">培训进程</view>
                <view class="fzpxInfo-main-group-around">
                <rich-text nodes="{{activity.course||'暂无'}}"></rich-text></view>
          <rich-text nodes="{{activity.course||'暂无'}}"></rich-text>
        </view>
            </view>
            <view class="fzpxInfo-main-group" style="display:block;padding: 10rpx 30rpx;">
                <view class="fzpxInfo-main-group-title">培训内容</view>
@@ -45,6 +46,13 @@
                </view>
            </view>

      <view class="fzpxInfo-main-group" wx:if="{{statequeId}}" data-id="{{statequeId}}" bindtap='businessSchedule'>
        <view class="fzpxInfo-main-group-title">问卷调查</view>
        <view style="display: flex; line-height:48rpx;">
          <image class="index-pane-icon " src="{{user}} " />
        </view>
      </view>

            <view wx:if="{{activity.result}}" class="fzpxInfo-main-group">
                <view class="fzpxInfo-main-group-title">培训结果</view>
                <view class="fzpxInfo-main-group-around">{{activity.result}}</view>

 SunshineLnsMinApp/pages/fzpxInfo/fzpxInfo.wxss

@@ -6,6 +6,39 @@
  background-color: #f1f1f1;
}

.guide-all-list {
  display: flex;
  flex-direction: column;
  padding: 2vh;
  border-bottom: 1px solid #f2f2f2;
}

.guide-all-list-top {
  font-size: 16px;
  color: #333;
}

.guide-all-list-bottom {
  font-size: 14px;
  color: #999;
  display: flex;
  margin-top: 1vh;
}

.guide-all-list-left {
  margin-right: auto;
}

.guide-all-list-right {
  width: 3vh;
  height: 3vh;
}
.index-pane-icon {
  width: 16px;
  height: 16px;
  float:right;
}

.fzpxInfo-bg {
  background-color: #f1f1f1;
  height: 100%;

 SunshineLnsMinApp/pages/pfyy/pfyy.js

@@ -13,7 +13,8 @@
    id: '',
    picType: '',
    evalList: {},
    picturesInfo: {}
    picturesInfo: {},
    ReplyLogs:[]
  },

  /**
@@ -30,12 +31,14 @@
      success: function (res) {
        console.log(res.data.data.lawAppointment)
        if (res.data.code == 0) {
          var data1 = res.data.data.ReplyLogs || [];
          that.setData({
            picturesInfo: {
              ...res.data.data.lawAppointment,
              createId: userinfo.id,
              activitiesTime: app.formatDateday(res.data.data.lawAppointment.activitiesTime)
            },
            ReplyLogs: data1,
            disabled
          })
        } else {
@@ -59,6 +62,44 @@

  },

  reply: function (e) {
    var that = this;
    var openId = wx.getStorageSync("openId")
    var obj = {
      openId: openId,
      content: that.data.picturesInfo.replyContent,
      busType: 25,
      busId: that.data.picturesInfo.id
    };
    wx.request({
      url: app.globalData.url + '/api/v1/pictures/reply',
      data: obj,
      method: 'POST',
      header: {
        "Content-Type": "application/json"
      },
      success: function (res) {
        if (res.data.code == 0) {
          wx.showToast({
            title: '提交回复成功',
            icon: 'success',
            duration: 2000
          })
          setTimeout(function () {
            wx.navigateBack({
              changed: true
            }); //返回上一页
          }, 2000)
        } else {
          wx.showModal({
            title: '提示',
            content: "提交失败！"
          })
        }
      }
    })
  },

  submit: function (e) {
    var picturesInfo = this.data.picturesInfo;
    if (!picturesInfo.schoolName) {

 SunshineLnsMinApp/pages/pfyy/pfyy.wxml

@@ -63,6 +63,39 @@
</div>
<div class="index-gray"></div>

<div class="{{ReplyLogs.length > 0 ? '':'displayNone'}}">
  <div class="reply-div">注：如有疑问，可在下方继续咨询</div>
  <div class="publicSnapshot-message">
    <span></span>
    <span>回复内容记录</span>
  </div>
  <div class="publicSnapshot-textarea">

    <div class='msg-reply-view-content' wx:for="{{ReplyLogs}}" wx:key="id">

      <div class='msg-reply-view-time-user' wx:if="{{item.userType ==2}}">检察官：{{item.createTime}}</div>
      <div class='msg-reply-view-time-admin' wx:if="{{item.userType ==1}}">我：{{item.createTime}}</div>
      <div class='msg-reply-view-user' wx:if="{{item.userType ==2}}">{{item.content}}</div>
      <div class='msg-reply-view-admin' wx:if="{{item.userType ==1}}">{{item.content}}</div>
    </div>
  </div>
  <div class="index-gray"></div>
</div>

<div class="{{disabled? 'displayNone':'submitButton'}}">
  <div style='width:90%' class="mini-submit" bindtap="submit">提交申请</div>
</div>
<div wx:if="{{ReplyLogs.length > 0}}" class="">
  <div class="index-gray"></div>
  <div class="publicSnapshot-message">
    <span></span>
    <span>继续回复</span>
  </div>
  <div class="publicSnapshot-textarea">
    <textarea data-name="replyContent" bindinput="inputChange" placeholder="请输入回复内容" />
  </div>
</div>
<div wx:if="{{ReplyLogs.length > 0}}" class="submitButton">
  <div class="mini-submit" bindtap="reply">提交回复</div>
  <div class="drafts" bindtap="goback">返回</div>
</div>

 SunshineLnsMinApp/pages/rzcx/rzcx.js

@@ -16,7 +16,8 @@
    evalList: {},
    dataSet: {},
    picturesInfo: {},
    entityId: ''
    entityId: '',
    approveLogs: []
  },

  /**
@@ -59,6 +60,7 @@
            ...res.data,
            createrId: userinfo.id,
          },
          approveLogs: res.data.approveLogs || [],
          entityId: res.data.id,
          disabled,
          evalList

 SunshineLnsMinApp/pages/rzcx/rzcx.wxml

@@ -27,6 +27,59 @@
        </div>
</div>
<div class="index-gray"></div>

<div class="boxshadow">
  <div class="publicSnapshot-message">
    <span></span>
    <span>申请理由</span>
  </div>
  <div class="border-bottom"></div>
  <div class="publicSnapshot-main" style='display:block'>
    <textarea data-name="reason" bindinput="inputChange" disabled="{{disabled}}" value='{{picturesInfo.reason}}' placeholder="请输入备注内容" />
  </div>
</div>

<div wx:if="{{approveLogs.length == 1}}">
  <div class="index-gray"></div>
  <div class="boxshadow">
    <div class="publicSnapshot-message">
      <span></span>
      <span>检察院审核</span>
    </div>
    <view class="fzpxInfo-main-group">
      <view class="fzpxInfo-main-group-title">审核意见</view>
      <view class="fzpxInfo-main-group-around">{{approveLogs[0].opinion}}</view>
    </view>
  </div>
</div>

<div wx:if="{{approveLogs.length == 2}}">
  <div class="index-gray"></div>
  <div class="boxshadow">
    <div class="publicSnapshot-message">
      <span></span>
      <span>检察院审核</span>
    </div>
    <view class="fzpxInfo-main-group">
      <!-- <view class="fzpxInfo-main-group-title">审核意见</view> -->
      <view class="fzpxInfo-main-group-around">{{approveLogs[0].opinion}}</view>
    </view>
  </div>
  <div class="index-gray"></div>
  <div class="boxshadow">
    <div class="publicSnapshot-message">
      <span></span>
      <span>公安审核</span>
    </div>
    <view class="fzpxInfo-main-group">
      <view class="fzpxInfo-main-group-around">{{approveLogs[1].opinion}}</view>
    </view>
  </div>

</div>




<div class="{{disabled? 'displayNone':'submitButton'}}">
  <div style='width:90%' class="mini-submit" bindtap="submit">提交申请</div>

 SunshineLnsMinApp/pages/rzcx/rzcx.wxss

@@ -14,6 +14,31 @@
  height: 48px;
}

.fzpxInfo-main-group {
  background-color: var(--white);
  padding: 1rpx 30rpx;
  display: flex;
  align-items: center;
  min-height: 78rpx;
  justify-content: space-between;
  border-top: 1rpx solid #eee;
}

.fzpxInfo-main-group-title {
  text-align: justify;
  padding-right: 30rpx;
  font-size: 30rpx;
  position: relative;
  height: 60rpx;
  line-height: 60rpx;
  min-width: calc(4em + 30rpx);
  font-weight: 600;
}

.fzpxInfo-main-group-around {
  line-height: 48rpx;
}

.activity-uploadImag-del {
  width: 20px;
  height: 20px;

 SunshineLnsMinApp/pages/xsjb/xsjb.js

@@ -32,6 +32,7 @@
    evalList: {},
    disabled: true,
    showInfo: false,
    id:''
  },

  /**
@@ -114,9 +115,6 @@
    if(!this.data.thisData.tipoffObject){
      return app.showModal("请填写举报对象！");
    }
    if(!this.data.thisData.tipoffAction){
      return app.showModal("请选择举报行为！");
    }
    if(!this.data.thisData.tipoffAddress){
      return app.showModal("请填写发生地！");
    }
@@ -183,7 +181,8 @@
    console.log(e)
    var that = this;
    console.log(that)
    app.joinPicture(e, that, e.currentTarget.dataset.associatetypeid, that.data.id);
    console.log('that.data.id', that.data.thisData.id)
    app.joinPicture(e, that, e.currentTarget.dataset.associatetypeid, that.data.thisData.id);
  },

  // 删除图片

 SunshineLnsMinApp/pages/xsjb/xsjb.wxml

@@ -10,11 +10,11 @@
                </wux-cell>
            </wux-field>

            <wux-field name="举报行为" initialValue="{{ displaytipoffAction }}">
            <!-- <wux-field name="举报行为" initialValue="{{ displaytipoffAction }}">
                <wux-popup-select options="{{ meetingWayList }}" bind:change="onPopupSelectChange" data-key="tipoffAction">
                    <wux-cell title="举报行为" is-link extra="{{ displaytipoffAction }}" required="{{true}}"></wux-cell>
                </wux-popup-select>
            </wux-field>
            </wux-field> -->

            <!-- <wux-field name="发生地" value="{{ meetingWay }}">
      <wux-cell hover-class="none" extra="{{dom}}">