From d7dc76fd0f932e3a5b7cd2b0afa4e301d5b857b5 Mon Sep 17 00:00:00 2001
From: sjz-mxj <1375998991@qq.com>
Date: Tue, 1 Aug 2023 20:33:32 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/massif/plant_plan.vue | 1 +
 pages/purchase/record.vue   | 2 +-
 pages/stock/list.vue        | 6 +++---
 pages/stock/mana.vue        | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pages/massif/plant_plan.vue b/pages/massif/plant_plan.vue
index 5a0733b..b5b46f1 100644
--- a/pages/massif/plant_plan.vue
+++ b/pages/massif/plant_plan.vue
@@ -55,6 +55,7 @@ export default {
 				varietyName:"",
 				plantType:"",
 				plantArea:"",
+				estimateOutput:"",
 				startTime:"",
 				harvestTime:"",
 				images:[],
diff --git a/pages/purchase/record.vue b/pages/purchase/record.vue
index f46a3d3..e541b2b 100644
--- a/pages/purchase/record.vue
+++ b/pages/purchase/record.vue
@@ -97,7 +97,7 @@
 						<text>审核部门：{{v.auditDepart}}</text>
 						<text v-if="v.applicantStatus ==='1' || v.applicantStatus ==='5'" class="over">意见：{{v.reason}}</text>
 					</view>
-					<text class="type" :style="{'--bg':({1:'#EE263A',2:'#FFCB69',3:'#FFCB69',4:'#FFCB69',5:'#00ff00'})[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>
 			<u-empty :show="list.length<=0" text="为查询到相关信息" width="70%" icon="/static/noData.png"/>
diff --git a/pages/stock/list.vue b/pages/stock/list.vue
index f696ef2..77819db 100644
--- a/pages/stock/list.vue
+++ b/pages/stock/list.vue
@@ -171,14 +171,14 @@
 				</block>
 				<!-- 农资出库、出库类型为损坏出库 -->
 				<block v-if="formData.substanceType==1&&formData.inOutType=='out02'"> 
-					<d-form label="采购单价" type='digit' v-model="formData.price" required field="price"/>
+					<!-- <d-form label="采购单价" type='digit' v-model="formData.price" required field="price"/> -->
 					<d-form label="处理方式" type="select" :columns="[processMode]" :value="[formData.processMode]" @select="formData.processMode=$event[0].value" required field="processMode"/>
 				</block>
 				<!-- 农产品出库、 出库类型为损坏出库-->
 				<block v-else-if="formData.substanceType==2&&formData.inOutType=='out03'">
 					<d-form label="损坏原因" type="select" :columns="[damageReason]" :value="formData.damageReason" @select="formData.damageReason=$event[0].value" required field="damageReason"/>
-					<d-form label="折价率" type="digit" v-model="formData.rateDiscount" required field="rateDiscount"/>
-					<d-form label="金额" type="digit" v-model="formData.amount" required field="amount"/>
+					<d-form label="折价率(%)" type="digit" v-model="formData.rateDiscount" required field="rateDiscount"/>
+					<d-form label="金额(元)" type="digit" v-model="formData.amount" required field="amount"/>
 				</block>
 				<d-form :label="`${({in:'入',out:'出'})[mode]}库批次号`" field="inOutBatchNo" required :disabled="formData.substanceType==2" :value="formData.inOutBatchNo" @input="formData.inOutBatchNo=$event" :btnText="formData.substanceType==1?'生成':''" :btnFun="()=>this.formData.inOutBatchNo=`${({in:'RK',out:'CK'})[this.mode]}${new Date().format('yyyyMMdd')}${new Date().getTime()}`"/>
 				<d-form :label="({1:`${({in:'入',out:'出'})[mode]}库数量`,2:'重量'})[formData.substanceType]" field="number" required :suffix="number.suffix" :value="formData.number" @input="formData.number=$event" type="digit"/>
diff --git a/pages/stock/mana.vue b/pages/stock/mana.vue
index 5b55bc0..1f63c34 100644
--- a/pages/stock/mana.vue
+++ b/pages/stock/mana.vue
@@ -170,7 +170,7 @@
 					<view class="num">
 						<text class="detailType">{{v.detailType}}</text>
 						<text class="warehouse over">{{v.wareHouseName}}</text>
-						<view class="btns" v-if="isWareMana">
+						<view class="btns">
 							<button class="cu-btn" :class="v.equivalentInventory>0?'out':'bg-gray'" @click="v.equivalentInventory>0 && toList('out',v)">出库</button>
 						</view>
 					</view>