2 Commits 085f915265 ... 6ddaf6900a

Autore SHA1 Messaggio Data
  lisy 6ddaf6900a Merge branch 'master' of http://git.yujin.shuziyunyao.com/yujin/forestry-wx 1 settimana fa
  lisy 4e8d5e57a8 风采完成 1 settimana fa

+ 1 - 1
src/plant/port/port-detail/index.vue

@@ -5,7 +5,7 @@
         </template>
         <template>
             <!-- <up-alert :title="'备注' + form?.remark" type = "warning" ></up-alert> -->
-            <view class="startline-title pl-24 ml-24 mb-16">基地信息</view>
+            <view class="startline-title pl-24 ml-24 mb-16 mt-10">基地信息</view>
             <view class="bg-#fff pd-24 mb-20">
                 <view v-if="form?.remark" class="pd4-16-20-16-20 bg-#EBF6EE c-primary f-s-30 f-w-5 b-radius mb-24">备注:{{ form?.remark }}</view>
                 <Baseinfo v-if="deawerData" :modeValue="deawerData" :baseType="form.taskType" :showClose="false" />

+ 5 - 2
src/plant/storage/finished-product/detail/index.vue

@@ -54,17 +54,20 @@
                         <view class="c-#666 w-s-no">入库量:</view>
                         <view class="d-flex flex-cln">
                             <span class="c-#333 f-w-500 d-flex a-c">{{ form?.specn }}*{{ form?.capacity }}{{ form?.unit }}</span>
-                            <span class="c-#333 f-w-500 d-flex a-c" v-if="form?.restSpecn">{{ form?.restSpecn }}*{{ form?.capacity }}{{ form?.unit }}</span>
+                            <span class="c-#333 f-w-500 d-flex a-c" v-if="+form?.restSpecn">{{ form?.restSpecn }}*{{ form?.capacity }}{{ form?.unit }}</span>
                         </view>
                     </view>
                     <view class="pd2-4-0 f-s-28 w-50% d-flex">
                         <span class="c-primary w-s-no">剩余量:</span>
                         <view class="d-flex flex-cln">
                             <span class="c-primary f-w-500">{{ form?.specn }}*{{ form?.restAmount }}{{ form?.unit }}</span>
-                            <span class="c-primary f-w-500 d-flex a-c" v-if="form?.restRestAmount">{{ form?.restSpecn }}*{{ form?.restRestAmount }}{{ form?.unit }}</span>
+                            <span class="c-primary f-w-500 d-flex a-c" v-if="+form?.restRestAmount">{{ form?.restSpecn }}*{{ form?.restRestAmount }}{{ form?.unit }}</span>
                         </view>
                     </view>
                 </view>
+                <view v-if="+form?.restAmount" class="pd3-20-40-0">
+                    <up-button @click="navigateToInventoryLoss" type="warning" plain :customStyle="{ background: '#FFF9EF', borderColor: '#F9D9A3' }">库存有消耗?库存损耗登记{{ '>' }}</up-button>
+                </view>
             </view>
             <view class="pd-24">
                 <view class="startline-title">成品信息</view>