Merge branch 'hcb' of SH-Arbitrate/miniapp into dev

This commit was merged in pull request #11.
This commit is contained in:
2023-09-26 18:00:06 +08:00
committed by Gitea
12 changed files with 245 additions and 188 deletions
+42 -41
View File
@@ -1,23 +1,23 @@
{
"name" : "智慧仲裁",
"appid" : "__UNI__EB3D433",
"description" : "",
"versionName" : "1.1.0",
"versionCode" : "100",
"transformPx" : false,
"app-plus" : {
"usingComponents" : true,
"nvueCompiler" : "uni-app",
"splashscreen" : {
"alwaysShowBeforeRender" : true,
"waiting" : true,
"autoclose" : true,
"delay" : 0
"name": "智慧仲裁",
"appid": "__UNI__EB3D433",
"description": "",
"versionName": "1.1.0",
"versionCode": "100",
"transformPx": false,
"app-plus": {
"usingComponents": true,
"nvueCompiler": "uni-app",
"splashscreen": {
"alwaysShowBeforeRender": true,
"waiting": true,
"autoclose": true,
"delay": 0
},
"modules" : {},
"distribute" : {
"android" : {
"permissions" : [
"modules": {},
"distribute": {
"android": {
"permissions": [
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
@@ -35,35 +35,36 @@
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
]
},
"ios" : {},
"sdkConfigs" : {}
"ios": {},
"sdkConfigs": {}
}
},
"quickapp" : {},
"mp-weixin" : {
"appid" : "wx91cb8459dca561b4",
"setting" : {
"urlCheck" : false,
"es6" : false,
"minified" : true,
"postcss" : true
"quickapp": {},
"mp-weixin": {
"appid": "wx91cb8459dca561b4",
"setting": {
"urlCheck": false,
"es6": false,
"minified": true,
"postcss": true
},
"optimization" : {
"subPackages" : true
"optimization": {
"subPackages": true
},
"usingComponents" : true
"usingComponents": true,
"permission": {}
},
"vueVersion" : "2",
"h5" : {
"template" : "static/index.html",
"devServer" : {
"port" : 9090,
"https" : false
"vueVersion": "2",
"h5": {
"template": "static/index.html",
"devServer": {
"port": 9090,
"https": false
},
"title" : "RuoYi-App",
"router" : {
"mode" : "hash",
"base" : "./"
"title": "RuoYi-App",
"router": {
"mode": "hash",
"base": "./"
}
}
}
+121 -65
View File
@@ -1,35 +1,44 @@
<template>
<view class="assignrbitrators">
<view class="from">
<uni-forms ref="form" :modelValue="formData" :rules="rules">
<uni-forms ref="form" :modelValue="subnitForm" :rules="rules">
<view class="title">案件详情</view>
<view class="box">
<uni-forms-item label="案件编号:" name="caseNum" label-width="120px" required>
<uni-easyinput :inputBorder="false" :disabled='true' v-model="formData.caseNum" placeholder="" />
<uni-easyinput :inputBorder="false" :disabled='true' v-model="formData.caseNum"
placeholder="" />
</uni-forms-item>
<uni-forms-item label="申请人:" name="applicantName" label-width="120px" required>
<uni-easyinput :inputBorder="false" :disabled='true' v-model="formData.applicantName" placeholder="" />
<uni-easyinput :inputBorder="false" :disabled='true' v-model="formData.applicantName"
placeholder="" />
</uni-forms-item>
<uni-forms-item label="被申请人:" name="respondentName" label-width="120px" required>
<uni-easyinput :inputBorder="false" :disabled='true' v-model="formData.respondentName" placeholder="" />
<uni-easyinput :inputBorder="false" :disabled='true' v-model="formData.respondentName"
placeholder="" />
</uni-forms-item>
<uni-forms-item label="借款开始日期:" name="loanStartDate" label-width="120px" required>
<uni-easyinput :inputBorder="false" :disabled='true' v-model="formData.loanStartDate" placeholder="" />
<uni-easyinput :inputBorder="false" :disabled='true' v-model="formData.loanStartDate"
placeholder="" />
</uni-forms-item>
<uni-forms-item label="借款结束日期:" name="loanEndDate" label-width="120px" required>
<uni-easyinput :inputBorder="false" :disabled='true' v-model="formData.loanEndDate" placeholder="" />
<uni-easyinput :inputBorder="false" :disabled='true' v-model="formData.loanEndDate"
placeholder="" />
</uni-forms-item>
<uni-forms-item label="案件标的:" name="caseSubjectAmount" label-width="120px" required>
<uni-easyinput :inputBorder="false" :disabled='true' v-model="formData.caseSubjectAmount" placeholder="" />
<uni-easyinput :inputBorder="false" :disabled='true' v-model="formData.caseSubjectAmount"
placeholder="" />
</uni-forms-item>
<uni-forms-item label="申请人主张欠本金:" name="claimPrinciOwed" label-width="120px" required>
<uni-easyinput :inputBorder="false" :disabled='true' v-model="formData.claimPrinciOwed" placeholder="" />
<uni-easyinput :inputBorder="false" :disabled='true' v-model="formData.claimPrinciOwed"
placeholder="" />
</uni-forms-item>
<uni-forms-item label="申请人主张欠利息:" name="claimInterestOwed" label-width="120px" required>
<uni-easyinput :inputBorder="false" :disabled='true' v-model="formData.claimInterestOwed" placeholder="" />
<uni-easyinput :inputBorder="false" :disabled='true' v-model="formData.claimInterestOwed"
placeholder="" />
</uni-forms-item>
<uni-forms-item label="申请人主张违约金:" name="claimLiquidDamag" label-width="120px" required>
<uni-easyinput :inputBorder="false" :disabled='true' v-model="formData.claimLiquidDamag" placeholder="" />
<uni-easyinput :inputBorder="false" :disabled='true' v-model="formData.claimLiquidDamag"
placeholder="" />
</uni-forms-item>
<uni-forms-item label="是否有异议需要举证" label-width="120px" name="objectionAddEviden" required>
<uni-data-checkbox class='checkbox' v-model="subnitForm.objectionAddEviden"
@@ -43,8 +52,8 @@
<uni-data-checkbox class='checkbox' v-model="subnitForm.pendingAppointArbotrar"
:localdata="uploadEvidence" @change='maintenancetypeChange'></uni-data-checkbox>
</uni-forms-item>
<uni-forms-item label="上传证据" name="headImage" label-width="120px" required>
<uni-file-picker ref="files" :auto-upload="false" @select="select" :limit='1'/>
<uni-forms-item label="上传证据" name="headImage" label-width="120px" v-if="caseFlag">
<uni-file-picker ref="files" :auto-upload="false" @select="select" :limit='1' />
</uni-forms-item>
</view>
</uni-forms>
@@ -52,7 +61,7 @@
<checkbox-group @change="checkboxChange">
<label class="uni-list-cell uni-list-cell-pd" v-for="item in items" :key="item.value">
<view>
<checkbox :value="item.id + ''"/>
<checkbox :value="item.id + ''" />
</view>
<view class="main">
<view class="">
@@ -78,26 +87,57 @@
</template>
<script>
import {respondentDetail,arbitratorList,evidenceCrossexami} from '../../../api/handlecase/index.js'
import { uploadImage } from '../../../api/upload.js'
import { getToken } from '@/utils/auth'
import {
respondentDetail,
arbitratorList,
evidenceCrossexami
} from '../../../api/handlecase/index.js'
import {
uploadImage
} from '../../../api/upload.js'
import {
getToken
} from '@/utils/auth'
import moment from 'moment'
const app = getApp()
export default {
data() {
return {
formData: {},
subnitForm:{},
selectFlag:false,
tempFilePaths:null,
rules: {},
maintenancetypeArr:[{
subnitForm: {},
selectFlag: false,
caseFlag: false,
tempFilePaths: null,
rules: {
// 是否有异议需要举证
objectionAddEviden: {
rules: [{
required: true,
errorMessage: '请选择'
}]
},
// 是否需要开庭审理
openCourtHear: {
rules: [{
required: true,
errorMessage: '请选择'
}]
},
// 是否指派仲裁员
pendingAppointArbotrar: {
rules: [{
required: true,
errorMessage: '请选择'
}]
},
},
maintenancetypeArr: [{
text: '是',
value: 1
}, {
text: '否',
value: 0
},],
}, ],
arbitrationmethodArr: [{
text: '是',
value: 1
@@ -105,7 +145,7 @@
text: '否',
value: 0
}],
uploadEvidence:[{
uploadEvidence: [{
text: '是',
value: 1
}, {
@@ -116,100 +156,113 @@
}
},
methods: {
arbitrationmethod(){},
uploadEvidenceChange(){},
maintenancetypeChange(val){
arbitrationmethod() {},
uploadEvidenceChange(val) {
let flag = val.detail.value;
if(flag == 1){
if (flag == 1) {
this.caseFlag = true;
} else if (flag == 0) {
this.caseFlag = false;
}
},
maintenancetypeChange(val) {
let flag = val.detail.value;
if (flag == 1) {
this.selectFlag = true
this.getArbitratorList()
}else{
} else {
this.selectFlag = false
}
},
checkboxChange (e) {
checkboxChange(e) {
let idArr = e.detail.value;
let numberArray = idArr.map(str => parseInt(str));
const result = this.items.filter(item => numberArray.includes(item.id));
let arbitrators = []
result.forEach(item=>{
result.forEach(item => {
arbitrators.push({
id:item.id,
arbitratorName:item.arbitratorName
id: item.id,
arbitratorName: item.arbitratorName
})
})
this.subnitForm.arbitrators = arbitrators;
},
getData(parms){
respondentDetail(parms).then(res=>{
getData(parms) {
respondentDetail(parms).then(res => {
this.formData = res.data
this.formData.loanEndDate = moment(this.formData.loanEndDate).format('YYYY-MM-DD HH:mm:ss');
this.formData.loanStartDate = moment(this.formData.loanStartDate).format('YYYY-MM-DD HH:mm:ss');
this.formData.loanStartDate = moment(this.formData.loanStartDate).format(
'YYYY-MM-DD HH:mm:ss');
this.formData.id = this.formData.id + ''
})
},
// 文件上传
select(e){
select(e) {
this.tempFilePaths = e.tempFilePaths;
// loading
uni.showLoading({
title: '上传中'
});
uni.uploadFile({
url:getApp().globalData.requestUrl + uploadImage,
url: getApp().globalData.requestUrl + uploadImage,
filePath: this.tempFilePaths[0],
header:{
Authorization:getToken() || '',
header: {
Authorization: getToken() || '',
},
formData: {
annexType:2,
id:this.formData.id
annexType: 6,
id: this.formData.id
},
name: 'file',
success:(res) => {
let { data } = res
success: (res) => {
let {
data
} = res
uni.showToast({
title:'上传成功',
icon:'none',
duration:1000
title: '上传成功',
icon: 'none',
duration: 1000
})
uni.hideLoading();
uni.navigateTo({
url:'/pages/handlecase/index'
})
},
fail:(err) => {
fail: (err) => {
uni.showToast({
title:'上传失败',
icon:'none',
duration:1000
title: '上传失败',
icon: 'none',
duration: 1000
})
uni.hideLoading()
}
})
},
// 获取仲裁员列表
getArbitratorList(){
arbitratorList().then(res=>{
getArbitratorList() {
arbitratorList().then(res => {
this.items = res.rows;
})
},
// 提交数据
evidenceCrossexamiFn(parms){
evidenceCrossexami(parms).then(res=>{
evidenceCrossexamiFn(parms) {
evidenceCrossexami(parms).then(res => {
uni.showToast({
title:'提交成功',
icon:'none',
duration:1000
title: '提交成功',
icon: 'none',
duration: 1000
})
uni.navigateTo({
url: '/pages/handlecase/index'
})
uni.navigateBack({delta: 1})
})
},
submitImg(){
submitImg() {
this.$refs.form.validate().then(res => {
this.evidenceCrossexamiFn(this.subnitForm)
}).catch(err => {
console.log('表单错误信息:', err);
})
}
},
onLoad(data){
onLoad(data) {
this.getData(data.id);
this.subnitForm.caseId = Number(data.id);
// this.getArbitratorList()
@@ -304,9 +357,11 @@
font-size: 24rpx;
// @include text-overflow($width: 100%)
}
.uni-list{
.uni-list {
width: 100%;
margin-top: 20rpx;
.uni-list-cell {
border-radius: 30rpx;
margin-bottom: 10rpx;
@@ -314,7 +369,8 @@
align-items: center;
justify-content: flex-start;
background-color: #fff;
.main{
.main {
height: 100%;
margin-left: 20rpx;
}
+20 -19
View File
@@ -9,7 +9,9 @@
<script>
import List from './component/list.vue'
import {respondentList} from '../../api/handlecase/index.js'
import {
respondentList
} from '../../api/handlecase/index.js'
import LuanqingEmpty from "@/components/luanqing-empty.vue"
export default {
components: {
@@ -18,17 +20,17 @@
},
data() {
return {
caseList:[],
pageNum:1,
pageSize:10
caseList: [],
pageNum: 1,
pageSize: 10
}
},
methods: {
getList(parms){
respondentList(parms).then(res=>{
getList(parms) {
respondentList(parms).then(res => {
this.caseList = res.rows;
this.caseList.forEach(item=>{
switch (item.caseStatus){
this.caseList.forEach(item => {
switch (item.caseStatus) {
case 0:
item.caseStatusName = '立案申请'
break;
@@ -86,24 +88,23 @@
},
// 触底
onReachBottom() {
if (this.caseList.length < 1){
if (this.caseList.length < 1) {
return
}
let obj = {
identityNum:"610425199505171615",
pageNum:this.pageNum,
pageSize:this.pageSize
identityNum: "610528199802285713",
pageNum: this.pageNum,
pageSize: this.pageSize
}
console.log(obj,"PPPPPPPPPPPPPPPPPP");
obj.pageNum = obj.pageNum + 1
this.getList(obj)
}
},
onLoad(){
onLoad() {
let obj = {
identityNum:"610425199505171615",
pageNum:this.pageNum,
pageSize:this.pageSize
identityNum: "610528199802285713",
pageNum: this.pageNum,
pageSize: this.pageSize
}
this.getList(obj)
}
@@ -111,8 +112,8 @@
</script>
<style lang="scss">
.handlecase{
.caseList{
.handlecase {
.caseList {
// height: 360rpx;
// background-color: #ffffff;
// border-radius: 30rpx;
+4 -4
View File
@@ -7,13 +7,13 @@
export default {
data() {
return {
name:"",
sendImg: "http://192.168.3.63:8081"
name: "",
sendImg: ""
}
},
onLoad: function() {
this.name = this.$store.state.user.name;
this.sendImg = `https://txroom.xayunmei.com/`
// this.name = this.$store.state.user.name;
this.sendImg = `https://txroom.xayunmei.com`
},
}
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+1 -3
View File
@@ -16,10 +16,7 @@
"pages/common/textview/index",
"pages/certification/index",
"pages/handlecase/index",
"pages/handlecase/component/assignrbitrators",
"pages/handlecase/component/uploadEvidence",
"pages/handlecase/component/confirmationEvidence",
"pages/handlecase/component/chooseMethod",
"mp_ecard_sdk/index/index",
"mp_ecard_sdk/protocol/eid/eid",
"mp_ecard_sdk/protocol/privacy/privacy",
@@ -59,5 +56,6 @@
}
]
},
"permission": {},
"usingComponents": {}
}
+3 -2
View File
@@ -15,10 +15,11 @@
"ignore": [],
"disablePlugins": [],
"outputPath": ""
}
},
"condition": false
},
"compileType": "miniprogram",
"libVersion": "3.0.1",
"libVersion": "3.1.1",
"appid": "wx91cb8459dca561b4",
"projectname": "智慧仲裁",
"condition": {},