前端

pages/erpbusiness/add_quality_testing.vue

@@ -158,8 +158,9 @@
 			<view v-if='typevalue==3&&utils.getCurrectRoles("acquisitionQuality.qview")||typevalue==1' class="c-row ">
 				<view class="title">货名</view>
 				<view class="con-list">
-					<view v-if='goodsdisabled'>{{gridList.goodsName}}</view>
-					<view v-if='!goodsdisabled' @click='show2=true'>{{gridList.goodsName}}</view>
+					<view>{{gridList.goodsName}}</view>
+					<!-- <view v-if='goodsdisabled'>{{gridList.goodsName}}</view> -->
+					<!-- <view v-if='!goodsdisabled' @click='show2=true'>{{gridList.goodsName}}</view> -->
 					<u-picker :range="goodsList" range-key="goodsName" @confirm='goodspicker($event)' v-model="show2"
 						mode="selector">
 					</u-picker>
@@ -305,7 +306,8 @@
 					</view>
 				</view>
 				<view class="c-row ">
-					<view class="title">容重（克/升）</view>
+					<view v-if='gridList.goodsName!="大豆"' class="title">容重（克/升）</view>
+					<view v-else class="title">蛋白</view>
 					<view class="con-list">
 						<input v-model='gridList.bulkDensity' placeholder="请输入容重" name="input" type="digit"></input>
 					</view>
@@ -1137,10 +1139,18 @@
 							this.$api.msg('霉变粒不能为空')
 							return
 						}
-						if (!this.gridList.bulkDensity) {
-							this.$api.msg('容重不能为空')
-							return
+						if(this.gridList.goodsName!="大豆"){
+							if (!this.gridList.bulkDensity) {
+								this.$api.msg('容重不能为空')
+								return
+							}
+						}else{
+							if (!this.gridList.bulkDensity) {
+								this.$api.msg('蛋白不能为空')
+								return
+							}
 						}
+						
 						if (!this.gridList.jiaorenli) {
 							this.$api.msg('热损伤不能为空')
 							return

pages/erpbusiness/edit_quality_testing.vue

@@ -307,7 +307,8 @@
 					</view>
 				</view>
 				<view class="c-row ">
-					<view class="title">容重（克/升）</view>
+					<view v-if='gridList.goodsName!="大豆"' class="title">容重（克/升）</view>
+					<view v-else class="title">蛋白</view>
 					<view class="con-list">
 						<input :disabled='flag==1' type="digit" v-model='gridList.bulkDensity' placeholder="请输入容重"
 							name="input"></input>
@@ -962,9 +963,16 @@
 						this.$api.msg('霉变粒不能为空')
 						return
 					}
-					if (!this.gridList.bulkDensity) {
-						this.$api.msg('容重不能为空')
-						return
+					if(this.gridList.goodsName!="大豆"){
+						if (!this.gridList.bulkDensity) {
+							this.$api.msg('容重不能为空')
+							return
+						}
+					}else{
+						if (!this.gridList.bulkDensity) {
+							this.$api.msg('蛋白不能为空')
+							return
+						}
 					}
 					if (!this.gridList.jiaorenli) {
 						this.$api.msg('热损伤不能为空')

pages/oa_office/the_oaOffice.vue

@@ -51,7 +51,7 @@
 						num: 0,
 						name: '打卡',
 						// icon: 'cuIcon-edit',
-						src: '../../static/img/sign/clock.png',
+						src: '../../static/img/oa_office/clock.png',
 						tips: 0,
 						url: `/pages/clock/the_clock`,
 						show: true
@@ -69,7 +69,7 @@
 						num: 2,
 						name: '加油',
 						// icon: 'cuIcon-edit',
-						src: '../../static/img/sign/fulling.png',
+						src: '../../static/img/oa_office/fulling.png',
 						tips: 0,
 						url: `/pages/fuelfilling/the_fuel_filling`,
 						show: true
@@ -78,7 +78,7 @@
 						num: 3,
 						name: '短途记录',
 						// icon: 'cuIcon-edit',
-						src: '../../static/img/sign/shortfull.png',
+						src: '../../static/img/oa_office/shortfull.png',
 						tips: 0,
 						url: `/pages/shortDistance/short_distance_record`,
 						show: true
@@ -87,7 +87,7 @@
 						num: 4,
 						name: '报销',
 						// icon: 'cuIcon-edit',
-						src: '../../static/img/sign/reimbursement.png',
+						src: '../../static/img/oa_office/reimbursement.png',
 						tips: 0,
 						url: `/pages/reimbursement/the_reimbursement`,
 						show: true
@@ -593,12 +593,14 @@
 	.cu-list>.cu-item:after {
 		border: none;
 	}
-
+	.cu-list>.cu-item{
+		text-align:center;
+	}
 	.sign {
 		width: 40px;
 		height: 40px;
 		top: 4px;
-		margin-right: 6px;
+		margin: 3px auto;
 	}
 
 	.indexUp {

pages/task/my_task.vue

@@ -20,7 +20,7 @@
 		</view>
 		<view class="introduce-section">
 			<view v-for="(item, index) in taskInfo" :key="index" @click="navToDetailPage(item)">
-				<view v-if="item.showRow" class="guess-item">
+				<view class="guess-item">
 					<view class="title flex align-item-center">
 						<view>
 							<view v-if='statusFlag==1' class="title-row1">待审批
@@ -380,11 +380,11 @@
 						for (var i = 0; i < this.taskInfo.length; i++) {
 							let _str = this.taskInfo[i]
 							// let a = this.getRoles()
-							if (_str.messageContent.indexOf("您发起") > -1) {
-								_str.showRow = false
-							} else {
-								_str.showRow = true;
-							}
+							// if (_str.messageContent.indexOf("您发起") > -1) {
+							// 	_str.showRow = false
+							// } else {
+							// 	_str.showRow = true;
+							// }
 							// if(_str.businessType=='TRADE'){
 							// 	_str.showRow = false
 							// }.split(' ')[0]