TC_GaoLiGongShan
/
manage_mobile
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://159.75.207.46:3000/denghong/plant_manage_mobile into master

master
邓宏 12 months ago
parent
3fe9e039d1 ec291c98c6
commit
58c85225b5
18 changed files with 41 additions and 41 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      pages/baseMana/formReacord.vue
  2. 4
      pages/home/index.vue
  3. 2
      pages/home/news.vue
  4. 2
      pages/massif/collectList.vue
  5. 8
      pages/massif/index.vue
  6. 4
      pages/massif/mana/farmRecord.vue
  7. 4
      pages/massif/mana/plantPlan.vue
  8. 2
      pages/massif/mana/recovery.vue
  9. 6
      pages/massif/mana/transactions.vue
  10. 4
      pages/massif/myPlant.vue
  11. 6
      pages/massif/pestType.vue
  12. 4
      pages/purchase/agrProdList.vue
  13. 4
      pages/purchase/detail.vue
  14. 4
      pages/purchase/record.vue
  15. 4
      pages/stock/already.vue
  16. 4
      pages/stock/mana.vue
  17. 8
      pages/stock/record.vue
  18. 6
      pages/warehouse/mana.vue

6
pages/baseMana/formReacord.vue
View File

@ -193,7 +193,7 @@
<d-dateRange @date="searchVal.startTime=$event[0];searchVal.endTime=$event[1];clean();search()"/>
<scroll-view scroll-y @scrolltolower="search">
<view class="card" v-for="(v,k) in list" :key="k" @click="v.growthProcess && toDetail(v)">
<template v-if="v.inputName">
@ -223,7 +223,7 @@
</view>
</template>
</view>
<u-empty v-if="list.length==0" text="为查询到相关信息" width="70%" icon="/static/noData.png"/>
<u-empty v-if="list.length==0" text="未查询到相关信息" width="70%" icon="/static/noData.png"/>
</scroll-view>
</view>
</template>
@ -298,4 +298,4 @@ import request from '@/common/request.js'
},
}
}
</script>
</script>

4
pages/home/index.vue
View File

@ -279,7 +279,7 @@
</u-image>
<text class="link">>></text>
</view>
<text class="line"/>
<text class="plant-nongzi" style="margin-right:64rpx;" @click="$u.route({url:'pages/stock/mana'})">库存</text>
<text class="plant-caigou" @click="$u.route({url:'pages/purchase/apply'})">采购</text>
@ -328,7 +328,7 @@
<u-notice-bar style="padding:0rpx;" icon="" speed="45" color="#777" bgColor="" :text="`${new Date(v.time).format('yyyy-MM-dd')}：${v.userName} 完成了${v.plotName}${v.farmWorkName}任务`"/>
</view>
</template>
<u-empty :show="isEmpty" text="为查询到相关信息" width="50%" icon="/static/noData.png"/>
<u-empty :show="isEmpty" text="未查询到相关信息" width="50%" icon="/static/noData.png"/>
</view>
<u-picker v-if="isAdmin" :show="show" :columns="plantBase" keyName="baseName" closeOnClickOverlay @close="show=false" @confirm="$store.commit('setBaseId', {id:$event.value[0].id,name:$event.value[0].baseName});show=false" @cancel="show=false"/>

2
pages/home/news.vue
View File

@ -227,7 +227,7 @@
<text class="date">{{new Date(v.sendTime).format('yyyy/MM/dd')}}</text>
</view>
</view>
<u-empty :show="list.length<=0" text="为查询到相关信息" width="50%" icon="/static/noData.png"/>
<u-empty :show="list.length<=0" text="未查询到相关信息" width="50%" icon="/static/noData.png"/>
</scroll-view>
</view>
</template>

2
pages/massif/collectList.vue
View File

@ -63,7 +63,7 @@
<text>{{v.goodsDetailType}}</text> <text>{{v.supplier}}</text>
</view>
</view>
<u-empty v-if="list.length==0" text="为查询到相关信息" width="70%" icon="/static/noData.png"/>
<u-empty v-if="list.length==0" text="未查询到相关信息" width="70%" icon="/static/noData.png"/>
</scroll-view>
</view>
</template>

8
pages/massif/index.vue
View File

@ -2,7 +2,7 @@
.container{
background:#F6F6F6;
height:100%;
scroll-view{
flex-grow: 1;
height:1rpx;
@ -81,9 +81,9 @@
<d-navbar style="--bg:#10C176;--c:#fff;" text="地块管理">
<text class="plant-xinjian" slot="right" @click="toInfo"/>
</d-navbar>
<d-search v-model="searchVal.search" @search="clean();search()" placeholder="输入地块名称或编号搜索"/>
<scroll-view scroll-y @scrolltolower="search">
<view class="card item" v-for="(v,k) in list" :key="k" @click="$u.route({url:'pages/massif/detail',params:{id:v.id}})">
<u-image width="220rpx" height="220rpx" radius="16rpx" :src="`${host}/${v.image}`" mode="aspectFill">
@ -103,7 +103,7 @@
</view>
</view>
</view>
<u-empty v-if="list.length==0" text="为查询到相关信息" width="70%" icon="/static/noData.png"/>
<u-empty v-if="list.length==0" text="未查询到相关信息" width="70%" icon="/static/noData.png"/>
</scroll-view>
</view>
</template>

4
pages/massif/mana/farmRecord.vue
View File

@ -155,7 +155,7 @@
<text>{{v.type}}</text> <text>负责人：{{v.principal}}</text> <text>记录日期：{{new Date(v.time).format('yyyy-MM-dd')}}</text>
</view>
</view>
<u-empty v-if="list.length<=0" text="为查询到相关信息" width="70%" icon="/static/noData.png"/>
<u-empty v-if="list.length<=0" text="未查询到相关信息" width="70%" icon="/static/noData.png"/>
</scroll-view>
</view>
</template>
@ -243,4 +243,4 @@ export default {
},
}
}
</script>
</script>

4
pages/massif/mana/plantPlan.vue
View File

@ -158,7 +158,7 @@
</template>
</view>
</view>
<u-empty v-if="list.length==0" text="为查询到相关信息" width="70%" icon="/static/noData.png"/>
<u-empty v-if="list.length==0" text="未查询到相关信息" width="70%" icon="/static/noData.png"/>
</scroll-view>
<button class="cu-btn round bg-green shadow submit" @click="addPlant">+新增种植计划</button>
@ -330,4 +330,4 @@ export default {
this.$provise.off('addFarming')
}
}
</script>
</script>

2
pages/massif/mana/recovery.vue
View File

@ -147,7 +147,7 @@
</view>
</view>
</view>
<u-empty v-if="list.length==0" text="为查询到相关信息" width="70%" icon="/static/noData.png"/>
<u-empty v-if="list.length==0" text="未查询到相关信息" width="70%" icon="/static/noData.png"/>
</scroll-view>
</view>
</template>

6
pages/massif/mana/transactions.vue
View File

@ -116,9 +116,9 @@
</view>
</view>
</view>
<u-empty v-if="list.length<=0" text="为查询到相关信息" width="70%" icon="/static/noData.png"/>
<u-empty v-if="list.length<=0" text="未查询到相关信息" width="70%" icon="/static/noData.png"/>
</scroll-view>
<u-datetime-picker
:show="show"
mode="date"
@ -198,4 +198,4 @@ export default {
},
}
}
</script>
</script>

4
pages/massif/myPlant.vue
View File

@ -167,7 +167,7 @@
</view>
</view>
</view>
<u-empty v-if="list.length==0" text="为查询到相关信息" width="70%" icon="/static/noData.png"/>
<u-empty v-if="list.length==0" text="未查询到相关信息" width="70%" icon="/static/noData.png"/>
</scroll-view>
</view>
</template>
@ -247,4 +247,4 @@ export default {
},
},
}
</script>
</script>

6
pages/massif/pestType.vue
View File

@ -76,7 +76,7 @@
}
}
}
.addPest{
position:absolute;
bottom:0;
@ -116,7 +116,7 @@
<view class="items">
<text :class="{active:select.some(i=>i==v.name)}" v-for="(v,k) in list" :key="k" @click="selectPest(v)">{{v.name}}</text>
</view>
<u-empty :show="list.length<=0" text="为查询到相关信息" width="70%" icon="/static/noData.png"/>
<u-empty :show="list.length<=0" text="未查询到相关信息" width="70%" icon="/static/noData.png"/>
</scroll-view>
<u-overlay :show="show" @click="show=false">
@ -293,4 +293,4 @@ export default {
},
}
}
</script>
</script>

4
pages/purchase/agrProdList.vue
View File

@ -67,7 +67,7 @@
<text>{{v.detailedType}}</text> <text class="over">{{v.supplier}}</text>
</view>
</view>
<u-empty v-if="list.length==0" text="为查询到相关信息" width="70%" icon="/static/noData.png"/>
<u-empty v-if="list.length==0" text="未查询到相关信息" width="70%" icon="/static/noData.png"/>
</scroll-view>
</view>
</template>
@ -137,4 +137,4 @@ export default {
},
}
}
</script>
</script>

4
pages/purchase/detail.vue
View File

@ -73,7 +73,7 @@
<text>{{v.detailedType}}</text> <text class="over">{{v.supplier}}</text> <text :data-total="v.heft">{{v.packing}}</text>
</view>
</view>
<u-empty v-if="list.length==0" text="为查询到相关信息" width="70%" icon="/static/noData.png"/>
<u-empty v-if="list.length==0" text="未查询到相关信息" width="70%" icon="/static/noData.png"/>
</view>
</view>
</template>
@ -109,4 +109,4 @@ export default {
},
}
}
</script>
</script>

4
pages/purchase/record.vue
View File

@ -100,7 +100,7 @@
<text class="type" :style="{'--bg':({1:'#EE263A',2:'#FFCB69',3:'#FFCB69',4:'#FFCB69',5:'rgb(16, 193, 118)'})[v.applicantStatus]}">{{({1:"审核未通过",2:"待审核",3:"待审核",4:"待审核",5:"审核通过"})[v.applicantStatus]}}</text>
</view>
</view>
<u-empty :show="list.length<=0" text="为查询到相关信息" width="70%" icon="/static/noData.png"/>
<u-empty :show="list.length<=0" text="未查询到相关信息" width="70%" icon="/static/noData.png"/>
</scroll-view>
</view>
</template>
@ -152,4 +152,4 @@ export default {
},
}
}
</script>
</script>

4
pages/stock/already.vue
View File

@ -98,7 +98,7 @@
<text class="number" :data-unit="`共${v.equivalentAmount}${v.unit}`">{{v.number}}{{v.packgeUnit}}</text>
</view>
</view>
<u-empty v-if="list.length==0" text="为查询到相关信息" width="70%" icon="/static/noData.png"/>
<u-empty v-if="list.length==0" text="未查询到相关信息" width="70%" icon="/static/noData.png"/>
</scroll-view>
</view>
</template>
@ -149,4 +149,4 @@ export default {
},
}
}
</script>
</script>

4
pages/stock/mana.vue
View File

@ -176,7 +176,7 @@
</view>
</template>
</view>
<u-empty v-if="list.length<=0" text="为查询到相关信息" width="70%" icon="/static/noData.png"/>
<u-empty v-if="list.length<=0" text="未查询到相关信息" width="70%" icon="/static/noData.png"/>
</scroll-view>
<button v-if="searchVal.substanceType=='nz'&& isWareMana" class="cu-btn round bg-green shadow submit" @click="toPage('agrWarehouse')">+农资入库</button>
@ -265,4 +265,4 @@ export default {
},
}
}
</script>
</script>

8
pages/stock/record.vue
View File

@ -2,7 +2,7 @@
.container{
height: 100%;
background:#f6f6f6;
&>.btns{
flex-shrink: 0;
margin:0 30rpx 30rpx;
@ -130,7 +130,7 @@
</style>
<template>
<view class="container flex">
<d-search v-model="searchVal.search" @search="clean();search()"/>
<view class="btns shadow bg-white">
@ -170,7 +170,7 @@
</view>
</template>
</view>
<u-empty v-if="list.length<=0" text="为查询到相关信息" width="70%" icon="/static/noData.png"/>
<u-empty v-if="list.length<=0" text="未查询到相关信息" width="70%" icon="/static/noData.png"/>
</scroll-view>
</view>
</template>
@ -238,4 +238,4 @@ export default {
this.search()
},
}
</script>
</script>

6
pages/warehouse/mana.vue
View File

@ -3,7 +3,7 @@
height: 100%;
background:#F6F6F6;
padding-bottom:20rpx;
scroll-view{
flex-grow: 1;
height:1rpx;
@ -90,7 +90,7 @@
</d-navbar>
<d-search v-model="searchVal.search" @search="clean();search()"/>
<scroll-view scroll-y @scrolltolower="search">
<view class="card item" v-for="(v,k) in list" :key="k" @click="toDetail(v)">
<view class="img">
@ -113,7 +113,7 @@
</view>
</view>
</view>
<u-empty v-if="list.length==0" text="为查询到相关信息" width="70%" icon="/static/noData.png"/>
<u-empty v-if="list.length==0" text="未查询到相关信息" width="70%" icon="/static/noData.png"/>
</scroll-view>
</view>
</template>

Write Preview
Loading…
Cancel
Save