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
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      pages/baseMana/formReacord.vue
  2. 2
      pages/home/index.vue
  3. 2
      pages/home/news.vue
  4. 2
      pages/massif/collectList.vue
  5. 2
      pages/massif/index.vue
  6. 2
      pages/massif/mana/farmRecord.vue
  7. 2
      pages/massif/mana/plantPlan.vue
  8. 2
      pages/massif/mana/recovery.vue
  9. 2
      pages/massif/mana/transactions.vue
  10. 2
      pages/massif/myPlant.vue
  11. 2
      pages/massif/pestType.vue
  12. 2
      pages/purchase/agrProdList.vue
  13. 2
      pages/purchase/detail.vue
  14. 2
      pages/purchase/record.vue
  15. 2
      pages/stock/already.vue
  16. 2
      pages/stock/mana.vue
  17. 2
      pages/stock/record.vue
  18. 2
      pages/warehouse/mana.vue

2
pages/baseMana/formReacord.vue
View File

@ -223,7 +223,7 @@
</view> </view>
</template> </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> </scroll-view>
</view> </view>
</template> </template>

2
pages/home/index.vue
View File

@ -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}任务`"/> <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> </view>
</template> </template>
<u-empty :show="isEmpty" text="为查询到相关信息" width="50%" icon="/static/noData.png"/> <u-empty :show="isEmpty" text="未查询到相关信息" width="50%" icon="/static/noData.png"/>
</view> </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"/> <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> <text class="date">{{new Date(v.sendTime).format('yyyy/MM/dd')}}</text>
</view> </view>
</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> </scroll-view>
</view> </view>
</template> </template>

2
pages/massif/collectList.vue
View File

@ -63,7 +63,7 @@
<text>{{v.goodsDetailType}}</text> <text>{{v.supplier}}</text> <text>{{v.goodsDetailType}}</text> <text>{{v.supplier}}</text>
</view> </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> </scroll-view>
</view> </view>
</template> </template>

2
pages/massif/index.vue
View File

@ -103,7 +103,7 @@
</view> </view>
</view> </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> </scroll-view>
</view> </view>
</template> </template>

2
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> <text>{{v.type}}</text> <text>负责人：{{v.principal}}</text> <text>记录日期：{{new Date(v.time).format('yyyy-MM-dd')}}</text>
</view> </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> </scroll-view>
</view> </view>
</template> </template>

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

@ -158,7 +158,7 @@
</template> </template>
</view> </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> </scroll-view>
<button class="cu-btn round bg-green shadow submit" @click="addPlant">+新增种植计划</button> <button class="cu-btn round bg-green shadow submit" @click="addPlant">+新增种植计划</button>

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

@ -147,7 +147,7 @@
</view> </view>
</view> </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> </scroll-view>
</view> </view>
</template> </template>

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

@ -116,7 +116,7 @@
</view> </view>
</view> </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> </scroll-view>
<u-datetime-picker <u-datetime-picker

2
pages/massif/myPlant.vue
View File

@ -167,7 +167,7 @@
</view> </view>
</view> </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> </scroll-view>
</view> </view>
</template> </template>

2
pages/massif/pestType.vue
View File

@ -116,7 +116,7 @@
<view class="items"> <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> <text :class="{active:select.some(i=>i==v.name)}" v-for="(v,k) in list" :key="k" @click="selectPest(v)">{{v.name}}</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> </scroll-view>
<u-overlay :show="show" @click="show=false"> <u-overlay :show="show" @click="show=false">

2
pages/purchase/agrProdList.vue
View File

@ -67,7 +67,7 @@
<text>{{v.detailedType}}</text> <text class="over">{{v.supplier}}</text> <text>{{v.detailedType}}</text> <text class="over">{{v.supplier}}</text>
</view> </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> </scroll-view>
</view> </view>
</template> </template>

2
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> <text>{{v.detailedType}}</text> <text class="over">{{v.supplier}}</text> <text :data-total="v.heft">{{v.packing}}</text>
</view> </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"/>
</view> </view>
</view> </view>
</template> </template>

2
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> <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>
</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> </scroll-view>
</view> </view>
</template> </template>

2
pages/stock/already.vue
View File

@ -98,7 +98,7 @@
<text class="number" :data-unit="`共${v.equivalentAmount}${v.unit}`">{{v.number}}{{v.packgeUnit}}</text> <text class="number" :data-unit="`共${v.equivalentAmount}${v.unit}`">{{v.number}}{{v.packgeUnit}}</text>
</view> </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> </scroll-view>
</view> </view>
</template> </template>

2
pages/stock/mana.vue
View File

@ -176,7 +176,7 @@
</view> </view>
</template> </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> </scroll-view>
<button v-if="searchVal.substanceType=='nz'&& isWareMana" class="cu-btn round bg-green shadow submit" @click="toPage('agrWarehouse')">+农资入库</button> <button v-if="searchVal.substanceType=='nz'&& isWareMana" class="cu-btn round bg-green shadow submit" @click="toPage('agrWarehouse')">+农资入库</button>

2
pages/stock/record.vue
View File

@ -170,7 +170,7 @@
</view> </view>
</template> </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> </scroll-view>
</view> </view>
</template> </template>

2
pages/warehouse/mana.vue
View File

@ -113,7 +113,7 @@
</view> </view>
</view> </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> </scroll-view>
</view> </view>
</template> </template>

Write Preview
Loading…
Cancel
Save