前端gjy

components/upload.vue

@@ -18,8 +18,8 @@
 		</view>
 		<slot name="file" :file="lists"></slot>
 		<view style="display: inline-block;" :style="{
-			background:customBack,
-			border:customBorder
+			background:custom?customBack:'transparent',
+			border:custom?customBorder:'1px solid transparent'
 		}" :class="custom?'customStyle':'default'"
 			@tap="selectFile" v-if="maxCount > lists.length">
 			<slot name="addBtn"></slot>

pages.json

@@ -127,6 +127,13 @@
 				"navigationBarTitleText": "我的粮脉"
 			}
 		},
+		{
+			"path": "pages/task/details",
+			"style": {
+				"enablePullDownRefresh": true,
+				"navigationBarTitleText": "详情"
+			}
+		},
 		{
 			"path": "pages/sale/portprice",
 			"style": {

pages/grain_pulse/home.vue

@@ -138,9 +138,9 @@
 				success: (res) => {
 					console.log(res.data)
 					this.position = res.data
-					uni.removeStorage({
-						key: 'setLocaltion'
-					})
+					// uni.removeStorage({
+					// 	key: 'setLocaltion'
+					// })
 				},
 
 			})

pages/grain_pulse/my_grain_pulse.vue

@@ -3,13 +3,15 @@
 		<scroll-view  scroll-x="true" scroll-with-animation="true" class='list-type'>
 			<view  v-for='item in searchTypes' @click='changetype(item)' :class='mainBusinessType==item.name?"Semibold active":"Regular"' class="typeitem">{{item.name}}</view>
 		</scroll-view>
-		<view v-for='item in datalist' class="listitem">
+		<view v-for='item in datalist' @click='todetails(item)' class="listitem">
 			<view class="flex" v-if='mainBusinessType=="我的企业"'>
 				<image class='listitem-left' :src="item.attachmentAddress" mode=""></image>
 				<view class="listitem-right">
 					<view class="flex justify-between">
 						<view class="companyname Medium">{{item.compName}}</view>
 						<view v-if='item.status=="待审核"' class='listitemStatus audit Regular'>审核中</view>
+						<view v-if='item.status=="已驳回"' class='listitemStatus notPass Regular'>未通过</view>
+						<view v-if='item.status=="已通过"' class='listitemStatus pass Regular'>已通过</view>
 					</view>
 					<view class='companylocation flex align-item-center Regular'>
 						<image class='location' src="../../static/img/liangmai/icon_ditu.png" mode=""></image>
@@ -18,13 +20,13 @@
 					<view>
 						<view class="button Regular">隐藏</view>
 						<view class="button Regular">编辑</view>
-						<view class="button Regular">删除</view>
+						<view @click='del(item)' class="button Regular">删除</view>
 					</view>
 				</view>
 			</view>
 			<view v-else>
 				<view class="flex">
-					<image class='listitem-left' src="../../static/img/authentication/bankup(2).png" mode=""></image>
+					<image class='listitem-left' :src="item.attachmentAddress" mode=""></image>
 					<view class="listitem-right">
 						<view class="flex justify-between">
 							<view class="companyname Medium">中天昊元粮库中天昊元粮库</view>
@@ -89,7 +91,7 @@
 					}
 				})
 				}else{
-					this.$api.doRequest('get','/settledCompanyInfo/myCollection',{commonId:this.userInfo.id,phone:this.userInfo.phone,pageSize:this.pageSize,
+					this.$api.doRequest('get','/settledCompanyInfo/myCollection',{phone:this.userInfo.phone,pageSize:this.pageSize,
 							currentPage: this.currentPage,pcFlag:2}).then(res => {
 					if(res.data.code==200){
 						this.datalist=res.data.data.records
@@ -97,14 +99,23 @@
 					})
 				}
 			},
+			del(item){
+				this.$api.doRequest('post','/settledCompanyInfo/api/deleteSettledCompanyInfo',{id:item.id}).then(res => {
+					if(res.data.code==200){
+						this.$api.msg('删除成功')
+					}else{
+						this.$api.msg('删除失败')
+					}
+				})
+			},
 			friendcircle(){
 				uni.navigateTo({
 					url:'/pages/grain_pulse/friendcircle'
 				})
 			},
-			todetails(){
+			todetails(item) {
 				uni.navigateTo({
-					url:'/pages/grain_pulse/details'
+					url: '/pages/grain_pulse/details?id=' + item.id
 				})
 			},
 			naviageToPage(item){

pages/grain_pulse/perfect.vue

@@ -6,7 +6,7 @@
 					<view style='width:100%;text-align:right;margin-right:10px;'>{{deptList.compName}}</view>
 				</u-form-item>
 			</view>
-			<view class="modular">
+			<view style='padding-bottom:10px;' class="modular">
 				<view class="title Medium">企业概况</view>
 				<!-- <u-input v-model="value" :type="type"  :height="height" :auto-height="autoHeight" placeholder="请输入企业概况，如经营项目、产品类型、企业规模等，不超过300个字" /> -->
 				<textarea value="" placeholder="请输入企业概况，如经营项目、产品类型、企业规模等，不超过300个字" class="areaText Regular"
@@ -20,9 +20,9 @@
 					<u-tag text="+" mode="plain" shape="circle" :show="show1" color="#2E2E2D" bg-color="#FFFFFF"
 						border-color="#F9F9FA" class="add" @click="add"></u-tag>
 				</view>
-				<view class="addinput flex" v-if="inputShow">
-					<u-input v-model="value" type="type" border focus v-if="inputShow"
-						style="border-radius: 50rpx;line-height: 70rpx;font-size: 10px;" placeholder="请输入标签内容，不超过6个字" />
+				<view class="addinput addlabel flex" v-if="inputShow">
+					<u-input class='label' v-model="value" type="type" border focus v-if="inputShow"
+					 placeholder="请输入标签内容，不超过6个字" />
 					<u-button :type="types" class="inputOk" shape="circle" @click="addinput">确定</u-button>
 				</view>
 			</view>
@@ -170,7 +170,10 @@
 	.center {
 		padding: 10rpx 20rpx;
 	}
-
+.label{
+	padding-right:30px;
+	border:none;
+}
 	.title {
 		margin-left: 20rpx;
 		color: #333333;
@@ -229,13 +232,23 @@
 		margin: 20rpx auto;
 		border-radius: 50rpx;
 	}
-
+.addlabel{
+	background:#F6F6F6;
+	position:relative;
+	border-radius: 50rpx;height: 70rpx;font-size: 10px;
+	padding-right:40px;
+	line-height: 52rpx;
+	margin-bottom:10px;
+}
 	.inputOk {
 		width: 100rpx;
 		border-radius: 40rpx;
 		background-color: #E9EAE9;
 		color: #FFFFFF;
+		height:70rpx;
 		border: none;
+		position:absolute;
+		right:0;
 	}
 	.picture {
 		width: 144rpx;

pages/task/details.vue

@@ -0,0 +1,107 @@
+<template name="task">
+	<view class="content">
+	<u-form :model="form" ref="uForm">
+			<u-form-item label-align='right' label-width='260' label="合同编号"><u-input v-model="form.name" /></u-form-item>
+			<u-form-item label-align='right' label-width='260' label="货名"><u-input v-model="form.intro" /></u-form-item>
+			<u-form-item label-align='right' label-width='260' label="仓位号"><u-input v-model="form.sex" /></u-form-item>
+			<u-form-item label-align='right' label-width='260' label="车牌号"><u-input v-model="form.sex" /></u-form-item>
+			<u-form-item label-align='right' label-width='260' label="入库日期"><u-input v-model="form.name" /></u-form-item>
+			<u-form-item label-align='right' label-width='260' label="蛋白(%)>="><u-input v-model="form.intro" /></u-form-item>
+			<u-form-item label-align='right' label-width='260' label="水分(%)<="><u-input v-model="form.sex" /></u-form-item>
+			<u-form-item label-align='right' label-width='260' label="单价(元/吨)"><u-input v-model="form.sex" /></u-form-item>
+			<u-form-item label-align='right' label-width='260' label="基差(元/吨)"><u-input v-model="form.name" /></u-form-item>
+			<u-form-item label-align='right' label-width='260' label="卸车费(元/吨)"><u-input v-model="form.intro" /></u-form-item>
+			<u-form-item label-align='right' label-width='260' label="发票费(元/吨)"><u-input v-model="form.sex" /></u-form-item>
+			<u-form-item label-align='right' label-width='260' label="扣款(元/吨)"><u-input v-model="form.sex" /></u-form-item>
+			<u-form-item label-align='right' label-width='260' label="结算单价(元/吨)"><u-input v-model="form.name" /></u-form-item>
+			<u-form-item label-align='right' label-width='260' label="净重(吨)"><u-input v-model="form.intro" /></u-form-item>
+			<u-form-item label-align='right' label-width='260' label="应付金额(元)"><u-input v-model="form.sex" /></u-form-item>
+			<u-form-item label-align='right' label-width='260' label="已付金额(元)"><u-input v-model="form.sex" /></u-form-item>
+			<u-form-item label-align='right' label-width='260' label="未付金额(元)"><u-input v-model="form.sex" /></u-form-item>
+			<u-form-item label-align='right' label-width='260' label="付款日期"><u-input v-model="form.name" /></u-form-item>
+			<u-form-item label-align='right' label-width='260' label="结转"><u-input v-model="form.intro" /></u-form-item>
+			<u-form-item label-align='right' label-width='260' label="客户确认"><u-input v-model="form.sex" /></u-form-item>
+			<u-form-item label-align='right' label-width='260' label="客户"><u-input v-model="form.sex" /></u-form-item>
+			<u-form-item label-align='right' label-width='260' label="库点"><u-input v-model="form.name" /></u-form-item>
+			<u-form-item label-align='right' label-width='260' label="发票类型"><u-input v-model="form.intro" /></u-form-item>
+			<u-form-item label-align='right' label-width='260' label="状态"><u-input v-model="form.sex" /></u-form-item>
+			<u-form-item label-align='right' label-width='260' label="已开发票(元)"><u-input v-model="form.sex" /></u-form-item>
+			
+		</u-form>
+		<view style='padding:10px;' class='flex'><u-button type="error">驳回</u-button><u-button  type="success">通过</u-button></view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState
+	} from 'vuex';
+	export default {
+		name: "task",
+		
+		data() {
+			return {
+				form: {
+								name: '',
+								intro: '',
+								sex: ''
+							},
+							checkboxList: [
+								{
+									name: '苹果',
+									checked: false,
+									disabled: false
+								},
+								{
+									name: '雪梨',
+									checked: false,
+									disabled: false
+								},
+								{
+									name: '柠檬',
+									checked: false,
+									disabled: false
+								}
+							],
+							radioList: [
+								{
+									name: '鲜甜',
+									disabled: false
+								},
+								{
+									name: '麻辣',
+									disabled: false
+								}
+							],
+							radio: '',
+							switchVal: false
+			};
+		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo'])
+		},
+		onShow() {
+			this.getIndexBuyData()
+			// this.userInfo =  uni.getStorageSync("userInfo")
+			this.warehouseInOutInfo.phone = this.userInfo.phone
+		},
+		onReachBottom() { //上拉触底函数
+			if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
+				this.warehouseInOutInfo.currentPage += 1
+				this.getIndexBuyData()
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page{
+		background: #fff;
+	}
+	.content{
+		padding:10px;
+	}
+</style>

pages/task/my_task.vue

@@ -19,7 +19,7 @@
 						{{item.carNo}}({{item.tranCarNo}})
 					</text>
 					<text v-else>{{item.messageTitle}}</text>
-					<view  class="title-tip-a" v-if="item.statusFlag==3">已完成</view>
+					<view  class="title-tip-a" v-if="statusFlag==3">已完成</view>
 					<view  class="title-tip" v-if="item.statusFlag==1">未完成</view>
 				</view>
 				<view v-if='statusFlag==1' class="flex title_b">
@@ -85,7 +85,12 @@
 		},
 		onReachBottom() { //上拉触底函数
 			if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
+			if(this.statusFlag==1){
 				this.warehouseInOutInfo.currentPage += 1
+			}else{
+				this.data.currentPage+=1
+			}
+				
 				this.getIndexBuyData()
 			}
 		},
@@ -203,6 +208,33 @@
 							that.isLoadMore = false
 							that.loadStatus = 'nomore'
 						}
+						if(this.statusFlag==3){
+							for(var i=0;i<this.taskInfo.length;i++){
+								if(this.taskInfo[i].businessType=='WAREHOUSE'){
+									if(this.taskInfo[i].businessCode=='INOUTTASK-TASK-APPROVE'){
+										this.taskInfo[i].messageTitle='出入库任务'
+									}
+								}else if(this.taskInfo[i].businessType=='REPORT'){
+									if(this.taskInfo[i].businessCode=='PROCUREMENT-RECEIPT-REPORT'){
+										this.taskInfo[i].messageTitle='采购入库统计'
+									}else if(this.taskInfo[i].businessCode=='PROCUREMENT-CLOSE-REPORT'){
+										this.taskInfo[i].messageTitle='采购平仓统计'
+									}else if(this.taskInfo[i].businessCode=='SALE-RECEIPT-REPORT'){
+										this.taskInfo[i].messageTitle='销售出库统计'
+									}else if(this.taskInfo[i].businessCode=='SALE-CLOSE-REPORT'){
+										this.taskInfo[i].messageTitle='销售平仓统计'
+									}
+								}else if(this.taskInfo[i].businessType=='PROCUREMENT'){
+									if(this.taskInfo[i].businessCode=='PROCUREMENT-ORDER-APPROVE'){
+										this.taskInfo[i].messageTitle='采购订单'
+									}
+								}else if(this.taskInfo[i].businessType=='SALE'){
+									if(this.taskInfo[i].businessCode=='SALE-ORDER-APPROVE'){
+										this.taskInfo[i].messageTitle='采购订单'
+									}
+								}
+							}
+						}
 						if(res.data.data.records.length==0){
 							that.isSole=true
 						}else{