mkm/OfficeApp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复bug

Browse Source
This commit is contained in:
weipengfei 2023-08-26 14:07:17 +08:00
parent 08f07935ce
commit 7199f95a77
10 changed files with 68 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
components/newArchives/breeding.vue
View File

@ -48,11 +48,11 @@
<u-icon slot="right" name="arrow-right"></u-icon> <u-icon slot="right" name="arrow-right"></u-icon>
</u-form-item> </u-form-item>
</picker> </picker>
<u-form-item labelWidth="auto" label="产量" required prop="yield" borderBottom> <u-form-item labelWidth="auto" label="产量(斤)" required prop="yield" borderBottom>
<u--input :readonly="readonly" v-model="formData.yield" placeholder="请输入产量"></u--input> <u--input :readonly="readonly" v-model="formData.yield" placeholder="请输入产量(斤)" type="number"></u--input>
</u-form-item> </u-form-item>
<u-form-item labelWidth="auto" label="预计收益" required prop="estimated_income" borderBottom> <u-form-item labelWidth="auto" label="预计收益(元)" required prop="estimated_income" borderBottom>
<u--input :readonly="readonly" v-model="formData.estimated_income" placeholder="请输入预计收益"></u--input> <u--input :readonly="readonly" v-model="formData.estimated_income" placeholder="请输入预计收益(元)" type="number"></u--input>
</u-form-item> </u-form-item>
<u-form-item labelWidth="auto" labelPosition="top" label="农资农具收益情况" required prop="farm_tools" <u-form-item labelWidth="auto" labelPosition="top" label="农资农具收益情况" required prop="farm_tools"
borderBottom> borderBottom>
@ -67,10 +67,10 @@
</u-radio> </u-radio>
</u-radio-group> </u-radio-group>
</u-form-item> </u-form-item>
<u-form-item labelWidth="auto" label="现代化程度" required prop="modernization" borderBottom> <u-form-item labelWidth="auto" label="现代化程度(%)" required prop="modernization" borderBottom>
<u--input :readonly="readonly" v-model="formData.modernization" placeholder="请输入现代化程度"></u--input> <u--input :readonly="readonly" v-model="formData.modernization" placeholder="请输入现代化程度(%)" type="number" maxlength="3"></u--input>
</u-form-item> </u-form-item>
<u-form-item labelWidth="auto" label="预售卖价格" required prop="pre_price" borderBottom> <u-form-item labelWidth="auto" label="预售卖价格(元/500g)" required prop="pre_price" borderBottom>
<u--input :readonly="readonly" v-model="formData.pre_price" placeholder="请输入预售卖价格"></u--input> <u--input :readonly="readonly" v-model="formData.pre_price" placeholder="请输入预售卖价格"></u--input>
</u-form-item> </u-form-item>
<u-form-item labelWidth="auto" label="销售方式" required prop="method_sales" borderBottom> <u-form-item labelWidth="auto" label="销售方式" required prop="method_sales" borderBottom>
@ -202,7 +202,9 @@
this.formData = this.$props.datas; this.formData = this.$props.datas;
let keys = Object.keys(this.formData); let keys = Object.keys(this.formData);
keys.forEach(item => { keys.forEach(item => {
if (!isNaN(this.formData[item])) this.formData[item] = +this.formData[item]; if (!isNaN(this.formData[item])&&this.formData[item]!=''&&this.formData[item]!=null&&this.formData[item]!=undefined){
parseFloat(this.formData[item])!='NaN'?this.formData[item] = parseFloat(this.formData[item]):null;
}
}) })
} }
}, },
@ -212,7 +214,9 @@
this.formData = this.$props.datas; this.formData = this.$props.datas;
let keys = Object.keys(this.formData); let keys = Object.keys(this.formData);
keys.forEach(item => { keys.forEach(item => {
if (!isNaN(this.formData[item])) this.formData[item] = +this.formData[item]; if (!isNaN(this.formData[item])&&this.formData[item]!=''&&this.formData[item]!=null&&this.formData[item]!=undefined){
parseFloat(this.formData[item])!='NaN'?this.formData[item] = parseFloat(this.formData[item]):null;
}
}) })
} }
} }

32
components/newArchives/plant.vue
View File

@ -12,8 +12,8 @@
<view class="card"> <view class="card">
<!-- <view class="title">种植信息</view> --> <!-- <view class="title">种植信息</view> -->
<u--form labelPosition="left" :model="formData" :rules="rules" ref="breedingForm"> <u--form labelPosition="left" :model="formData" :rules="rules" ref="breedingForm">
<u-form-item labelWidth="auto" label="土地总面积" required prop="cultivated_area" borderBottom> <u-form-item labelWidth="auto" label="土地总面积(亩)" required prop="cultivated_area" borderBottom>
<u--input :readonly="readonly" v-model="formData.cultivated_area" placeholder="请输入土地总面积"></u--input> <u--input :readonly="readonly" v-model="formData.cultivated_area" placeholder="请输入土地总面积(亩)" type="number"></u--input>
</u-form-item> </u-form-item>
<picker :range="landPlanList" :disabled="readonly" mode="selector" @change="changeLanPlan"> <picker :range="landPlanList" :disabled="readonly" mode="selector" @change="changeLanPlan">
<u-form-item labelWidth="auto" label="土地规划" required prop="planning" borderBottom> <u-form-item labelWidth="auto" label="土地规划" required prop="planning" borderBottom>
@ -45,8 +45,8 @@
<u-form-item labelWidth="auto" label="种植类型" required prop="breeding_type" borderBottom> <u-form-item labelWidth="auto" label="种植类型" required prop="breeding_type" borderBottom>
<u--input :readonly="readonly" v-model="formData.breeding_type" placeholder="请输入种植类型"></u--input> <u--input :readonly="readonly" v-model="formData.breeding_type" placeholder="请输入种植类型"></u--input>
</u-form-item> </u-form-item>
<u-form-item labelWidth="auto" label="面积" required prop="area" borderBottom> <u-form-item labelWidth="auto" label="面积(亩)" required prop="area" borderBottom>
<u--input :readonly="readonly" v-model="formData.area" placeholder="请输入面积"></u--input> <u--input :readonly="readonly" v-model="formData.area" placeholder="请输入面积(亩)" type="number"></u--input>
</u-form-item> </u-form-item>
<picker mode="date" @change="changeDate" :disabled="readonly" :data-value="'breeding_time'"> <picker mode="date" @change="changeDate" :disabled="readonly" :data-value="'breeding_time'">
<u-form-item labelWidth="auto" label="种植开始时间" required prop="breeding_time" borderBottom> <u-form-item labelWidth="auto" label="种植开始时间" required prop="breeding_time" borderBottom>
@ -62,11 +62,11 @@
<u-icon slot="right" name="arrow-right"></u-icon> <u-icon slot="right" name="arrow-right"></u-icon>
</u-form-item> </u-form-item>
</picker> </picker>
<u-form-item labelWidth="auto" label="产量" required prop="yield" borderBottom> <u-form-item labelWidth="auto" label="产量(斤)" required prop="yield" borderBottom>
<u--input :readonly="readonly" v-model="formData.yield" placeholder="请输入产量"></u--input> <u--input :readonly="readonly" v-model="formData.yield" placeholder="请输入产量(斤)" type="number"></u--input>
</u-form-item> </u-form-item>
<u-form-item labelWidth="auto" label="预计收益" required prop="estimated_income" borderBottom> <u-form-item labelWidth="auto" label="预计收益(元)" required prop="estimated_income" borderBottom>
<u--input :readonly="readonly" v-model="formData.estimated_income" placeholder="请输入预计收益"></u--input> <u--input :readonly="readonly" v-model="formData.estimated_income" placeholder="请输入预计收益(元)" type="number"></u--input>
</u-form-item> </u-form-item>
<u-form-item labelWidth="auto" labelPosition="top" label="农资农具收益情况" required prop="farm_tools" <u-form-item labelWidth="auto" labelPosition="top" label="农资农具收益情况" required prop="farm_tools"
borderBottom> borderBottom>
@ -81,11 +81,11 @@
</u-radio> </u-radio>
</u-radio-group> </u-radio-group>
</u-form-item> </u-form-item>
<u-form-item labelWidth="auto" label="现代化程度" required prop="modernization" borderBottom> <u-form-item labelWidth="auto" label="现代化程度(%)" required prop="modernization" borderBottom>
<u--input :readonly="readonly" v-model="formData.modernization" placeholder="请输入现代化程度"></u--input> <u--input :readonly="readonly" v-model="formData.modernization" placeholder="请输入现代化程度(%)" type="number" maxlength="3"></u--input>
</u-form-item> </u-form-item>
<u-form-item labelWidth="auto" label="预售卖价格" required prop="pre_price" borderBottom> <u-form-item labelWidth="auto" label="预售卖价格(元/500g)" required prop="pre_price" borderBottom>
<u--input :readonly="readonly" v-model="formData.pre_price" placeholder="请输入预售卖价格"></u--input> <u--input :readonly="readonly" v-model="formData.pre_price" placeholder="请输入预售卖价格" type="number"></u--input>
</u-form-item> </u-form-item>
<u-form-item labelWidth="auto" label="销售方式" required prop="method_sales" borderBottom> <u-form-item labelWidth="auto" label="销售方式" required prop="method_sales" borderBottom>
<u-radio-group :disabled="readonly" v-model="formData.method_sales" style="margin: 16rpx;"> <u-radio-group :disabled="readonly" v-model="formData.method_sales" style="margin: 16rpx;">
@ -217,7 +217,9 @@
this.formData = this.$props.datas; this.formData = this.$props.datas;
let keys = Object.keys(this.formData); let keys = Object.keys(this.formData);
keys.forEach(item => { keys.forEach(item => {
if (!isNaN(this.formData[item])) this.formData[item] = +this.formData[item]; if (!isNaN(this.formData[item])&&this.formData[item]!=''&&this.formData[item]!=null&&this.formData[item]!=undefined){
parseFloat(this.formData[item])!='NaN'?this.formData[item] = parseFloat(this.formData[item]):null;
}
}) })
} }
}, },
@ -227,7 +229,9 @@
this.formData = this.$props.datas; this.formData = this.$props.datas;
let keys = Object.keys(this.formData); let keys = Object.keys(this.formData);
keys.forEach(item => { keys.forEach(item => {
if (!isNaN(this.formData[item])) this.formData[item] = +this.formData[item]; if (!isNaN(this.formData[item])&&this.formData[item]!=''&&this.formData[item]!=null&&this.formData[item]!=undefined){
parseFloat(this.formData[item])!='NaN'?this.formData[item] = parseFloat(this.formData[item]):null;
}
}) })
} }
} }

6
components/newArchives/residents.vue
View File

@ -10,13 +10,13 @@
</u-form-item> </u-form-item>
<picker mode="date" value="1990-01-01" @change="changebirth_time" :disabled="readonly" :data-index="index"> <picker mode="date" value="1990-01-01" @change="changebirth_time" :disabled="readonly" :data-index="index">
<u-form-item labelWidth="auto" label="出生日期" required prop="family.birth_time" borderBottom> <u-form-item labelWidth="auto" label="出生日期" required prop="family.birth_time" borderBottom>
<u--input :value="item.birth_time" placeholder="请选择出生日期" disabled disabledColor="#fff"></u--input> <u--input :value="item.birth_time" placeholder="请选择出生日期" readonly></u--input>
<u-icon slot="right" name="arrow-right"></u-icon> <u-icon slot="right" name="arrow-right"></u-icon>
</u-form-item> </u-form-item>
</picker> </picker>
<picker mode="selector" :range="situationList" @change="changesituation" :disabled="readonly" :data-index="index"> <picker mode="selector" :range="situationList" @change="changesituation" :disabled="readonly" :data-index="index">
<u-form-item labelWidth="auto" label="就业情况" required prop="family.situation" borderBottom> <u-form-item labelWidth="auto" label="就业情况" required prop="family.situation" borderBottom>
<u--input :value="situationList[item.situation]" placeholder="请选择就业情况" disabled disabledColor="#fff"></u--input> <u--input :value="situationList[item.situation]" placeholder="请选择就业情况" readonly></u--input>
<u-icon slot="right" name="arrow-right"></u-icon> <u-icon slot="right" name="arrow-right"></u-icon>
</u-form-item> </u-form-item>
</picker> </picker>
@ -39,7 +39,7 @@
</u-form-item> </u-form-item>
<block value="是" v-if="residents.child>0" v-for="(item,index) in residents.child_arr" :key="'child'+index"> <block value="是" v-if="residents.child>0" v-for="(item,index) in residents.child_arr" :key="'child'+index">
<u-form-item label="年龄" required prop="child_arr.age" borderBottom> <u-form-item label="年龄" required prop="child_arr.age" borderBottom>
<u--input v-model="item.age" :readonly="readonly" placeholder="请输入年龄" type="number" maxlength="3"></u--input> <u--input v-model="item.age" :readonly="readonly" placeholder="请输入年龄" type="number" maxlength="2"></u--input>
</u-form-item> </u-form-item>
<block v-if="item.age<4"> <block v-if="item.age<4">
<u-form-item labelWidth="auto" label="喂养方式" borderBottom> <u-form-item labelWidth="auto" label="喂养方式" borderBottom>

13
components/newArchives/store.vue
View File

@ -21,8 +21,8 @@
</u-radio> </u-radio>
</u-radio-group> </u-radio-group>
</u-form-item> </u-form-item>
<u-form-item labelWidth="auto" label="门面面积" required prop="area" borderBottom> <u-form-item labelWidth="auto" label="门面面积(m²)" required prop="area" borderBottom>
<u--input :readonly="readonly" v-model="formData.area" placeholder="请输入门面面积"></u--input> <u--input :readonly="readonly" v-model="formData.area" placeholder="请输入门面面积(m²)" type="number"></u--input>
</u-form-item> </u-form-item>
<u-form-item labelWidth="auto" label="经营地点" required prop="place" borderBottom> <u-form-item labelWidth="auto" label="经营地点" required prop="place" borderBottom>
<u--input :readonly="readonly" v-model="formData.place" placeholder="请输入经营地点"></u--input> <u--input :readonly="readonly" v-model="formData.place" placeholder="请输入经营地点"></u--input>
@ -141,9 +141,10 @@
this.formData = this.$props.datas; this.formData = this.$props.datas;
let keys = Object.keys(this.formData); let keys = Object.keys(this.formData);
keys.forEach(item => { keys.forEach(item => {
if (!isNaN(this.formData[item])) this.formData[item] = +this.formData[item]; if (!isNaN(this.formData[item])&&this.formData[item]!=''&&this.formData[item]!=null&&this.formData[item]!=undefined){
parseFloat(this.formData[item])!='NaN'?this.formData[item] = parseFloat(this.formData[item]):null;
}
}) })
// console.log(this.formData);
} }
}, },
watch: { watch: {
@ -152,7 +153,9 @@
this.formData = this.$props.datas; this.formData = this.$props.datas;
let keys = Object.keys(this.formData); let keys = Object.keys(this.formData);
keys.forEach(item => { keys.forEach(item => {
if (!isNaN(this.formData[item])) this.formData[item] = +this.formData[item]; if (!isNaN(this.formData[item])&&this.formData[item]!=''&&this.formData[item]!=null&&this.formData[item]!=undefined){
parseFloat(this.formData[item])!='NaN'?this.formData[item] = parseFloat(this.formData[item]):null;
}
}) })
} }
} }

14
router/router.js
View File

@ -22,6 +22,20 @@ const initRouter = () => {
functionList.forEach(item => { functionList.forEach(item => {
uni.addInterceptor(item, { uni.addInterceptor(item, {
invoke(args) { invoke(args) {
uni.getSystemInfo({
success: function(res) {
console.log('系统信息', res)
// 获取内存相关指标
var totalMem = res.totalMem // 总内存大小（单位：MB）
var usedMem = res.usedMem // 已使用内存大小（单位：MB）
var availableMem = res.availableMem // 可用内存大小（单位：MB）
// 输出结果
console.log('总内存大小（MB）:', totalMem)
console.log('已使用内存大小（MB）:', usedMem)
console.log('可用内存大小（MB）:', availableMem)
}
})
if (!hasPermission(args.url)) { if (!hasPermission(args.url)) {
Toast('登录后查看更多') Toast('登录后查看更多')
return false; return false;

2
subpkg/archives/archives.vue
View File

@ -244,9 +244,7 @@
} else { } else {
this.loadConfig.page++; this.loadConfig.page++;
} }
console.log(this.list);
this.list = [...this.list, ...res.data]; this.list = [...this.list, ...res.data];
console.log(this.list);
}, },
changeCurrent(e) { changeCurrent(e) {
this.current = e.index; this.current = e.index;

11
subpkg/archivesDetail/archivesDetail.vue
View File

@ -193,7 +193,7 @@
<view class="right"> <view class="right">
<view class=""> <view class="">
<text>年龄 :</text> <text>年龄 :</text>
<text>{{item.age+'岁'}}</text> <text>{{item.age + '岁'}}</text>
</view> </view>
<view class="check_view_group"> <view class="check_view_group">
<text>年级 :</text> <text>年级 :</text>
@ -222,7 +222,7 @@
<view class="right"> <view class="right">
<view class=""> <view class="">
<text>年龄 :</text> <text>年龄 :</text>
<text>{{item.age}}</text> <text>{{item.age + '岁'}}</text>
</view> </view>
<view class="check_view_group"> <view class="check_view_group">
@ -487,6 +487,10 @@
.check_view_group { .check_view_group {
display: flex; display: flex;
margin-top: 4rpx;
&:last-child{
margin-top: 0;
}
// line-height: 70rpx; // line-height: 70rpx;
.radio{ .radio{
margin-left: 16rpx; margin-left: 16rpx;
@ -494,8 +498,7 @@
margin-bottom: 0 !important; margin-bottom: 0 !important;
} }
} }
// align-items: center; // align-items: center;
} }

1
subpkg/blockTransaction/blockTransaction.vue
View File

@ -127,6 +127,7 @@
} }
Object.keys(this.card).forEach((key)=>{ Object.keys(this.card).forEach((key)=>{
if(res.data?.arr[key]!=null&&res.data?.arr[key]!=undefined)this.card[key] = res.data.arr[key]; if(res.data?.arr[key]!=null&&res.data?.arr[key]!=undefined)this.card[key] = res.data.arr[key];
// if(res.data?.extend?.transaction?.arr[key]!=null&&res.data?.extend?.transaction?.arr[key]!=undefined)this.card[key] = res.data?.extend?.transaction?.arr[key];
}) })
this.list = [...this.list, ...res.data?.list] this.list = [...this.list, ...res.data?.list]
} catch (e) { } catch (e) {

8
subpkg/captain/captain.vue
View File

@ -28,12 +28,12 @@
@click="navTo(`/subpkg/archives/archives?id=${item.id}&task_id=${task_id}`)"> @click="navTo(`/subpkg/archives/archives?id=${item.id}&task_id=${task_id}`)">
<view class="card_head"> <view class="card_head">
<text style="font-size: 34rpx;">最后更新: {{item.informationg_update_time.split(' ')[0]}}</text> <text style="font-size: 34rpx;">最后更新: {{item.informationg_update_time.split(' ')[0]}}</text>
<text v-if="task_id<=0">{{'管理户数: '+item.informationg_count+" 户"}}<u-icon <view v-if="task_id<=0">{{'管理户数: '+item.informationg_count+" 户"}}<u-icon
style="display: inline-block;margin-left: 10rpx;" color="white" style="display: inline-block;margin-left: 10rpx;" color="white"
name="arrow-right"></u-icon></text> name="arrow-right"></u-icon></view>
<text v-else>{{'更新户数: '+item.informationg_update_count+" 户"}}<u-icon <view v-else>{{'更新户数: '+item.informationg_update_count+" 户"}}<u-icon
style="display: inline-block;margin-left: 10rpx;" color="white" style="display: inline-block;margin-left: 10rpx;" color="white"
name="arrow-right"></u-icon></text> name="arrow-right"></u-icon></view>
</view> </view>
<view class="card_content"> <view class="card_content">
<view class="left"> <view class="left">

2
subpkg/companyInfo/companyInfo.vue
View File

@ -9,8 +9,6 @@
<company></company> <company></company>
</view> </view>
<view class="company_list" v-show="current==1"> <view class="company_list" v-show="current==1">
<!-- <view class="info_card" v-for="item in companyList" :key="item.id"> <!-- <view class="info_card" v-for="item in companyList" :key="item.id">
<view class="top" @click="navTo('/subpkg/companySign/companySign?id='+item.id)"> <view class="top" @click="navTo('/subpkg/companySign/companySign?id='+item.id)">
<view> <view>