gjy 3 gadi atpakaļ
vecāks
revīzija
8f5bc86d6a

+ 1 - 1
config/index.js

@@ -1,7 +1,7 @@
 const dev = {
 	baseUrl: 'https://www.zthymaoyi.com',
 	baseUrlNew: 'http://192.168.1.120:8090/',
-	//baseUrlNew: 'http://api.eliangeyun.com/',
+	// baseUrlNew: 'http://api.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

+ 21 - 0
pages.json

@@ -168,6 +168,27 @@
 				"navigationBarTitleText": "采购入库统计详情"
 			}
 		},
+		{
+			"path": "pages/task/sale_report_details",
+			"style": {
+				"enablePullDownRefresh": true,
+				"navigationBarTitleText": "销售出库统计详情"
+			}
+		},
+		{
+			"path": "pages/task/sale_close_details",
+			"style": {
+				"enablePullDownRefresh": true,
+				"navigationBarTitleText": "销售平仓统计详情"
+			}
+		},
+		{
+			"path": "pages/task/procurement_close_details",
+			"style": {
+				"enablePullDownRefresh": true,
+				"navigationBarTitleText": "采购平仓统计详情"
+			}
+		},
 		{
 			"path": "pages/sale/portprice",
 			"style": {

+ 1 - 1
pages/task/procurement_details.vue

@@ -15,7 +15,7 @@
 				<u-input v-model="list.unitPrice" />
 			</u-form-item>
 			<u-form-item v-if='list.procurementPlanType=="期货"' label-width='260' label="基差(元/吨)">
-				{{basis}}
+				{{list.basis}}
 			</u-form-item>
 			<u-form-item v-if='list.procurementPlanType=="期货"' label-width='260' label="冻结定金(元)">
 				{{list.freezingDeposit}}

+ 135 - 64
pages/task/procurement_report_details.vue

@@ -1,34 +1,68 @@
 <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-item label-width='260' label="合同编号">
+				{{list.contractNo}}
+			</u-form-item>
+			<u-form-item label-width='260' label="货名">
+				{{list.goodsName}}
+			</u-form-item>
+			<u-form-item label-width='260' label="仓位号">
+				{{list.positionNumber}}
+			</u-form-item>
+			<u-form-item label-width='260' label="车牌号">
+				{{ list.carNo }}({{ list.tranCarNo }})
+			</u-form-item>
+			<u-form-item label-width='260' label="入库日期">
+				{{list.warehousingDate}}
+			</u-form-item>
+			<u-form-item label-width='260' label="蛋白(%)>=">
+				{{list.protein}}
+			</u-form-item>
+			<u-form-item label-width='260' label="水分(%)<=">
+				{{list.waterContent}}
+			</u-form-item>
+			<u-form-item label-width='260' label="单价(元/吨)">
+				{{list.unitPrice}}
+			</u-form-item>
+			<u-form-item label-width='260' label="基差(元/吨)">
+				{{list.basisPrice}}
+			</u-form-item>
+			<u-form-item label-width='260' label="卸车费(元/吨)">
+				{{list.unloadingCharge}}
+			</u-form-item>
+			<u-form-item label-width='260' label="发票费(元/吨)">
+				{{list.invoiceFee}}
+			</u-form-item>
+			<u-form-item label-width='260' label="扣款(元/吨)">
+				{{list.deductionAmount}}
+			</u-form-item>
+			<u-form-item label-width='260' label="结算单价(元/吨)">
+				{{list.settlementPrice}}
+			</u-form-item>
+			<u-form-item label-width='260' label="净重(吨)">
+				{{list.netWeight}}
+			</u-form-item>
+			<u-form-item  label-width='260' label="应付金额(元)">
+				{{list.amountIngPayable}}
+			</u-form-item>
+			<u-form-item  label-width='260' label="已付金额(元)">
+				{{list.amountEdPayable}}
+			</u-form-item>
+			<u-form-item label-width='260' label="未付金额(元)">
+				{{list.amountNotPayable}}
+			</u-form-item>
+			<u-form-item  label-width='260' label="付款日期">
+				{{list.paymentDate}}
+			</u-form-item>
+			<u-form-item label-width='260' label="结转">
+				{{list.carryForward}}
+			</u-form-item>
+			<u-form-item  label-width='260' label="付款日期">
+				{{list.paymentDate}}
+			</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 style='padding:10px;' class='flex'><u-button v-if='list.status=="待审核"' @click='audit' type="success">审核</u-button></view>
 	</view>
 </template>
 
@@ -41,58 +75,95 @@
 		
 		data() {
 			return {
+				show:false,
+				id:0,
 				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
+					name: '',
+					intro: '',
+					sex: ''
+				},
+				list:{},
+				radio: '',
+				pcUserInfo:uni.getStorageSync('pcUserInfo'),
+				switchVal: false,
+				contractNoList:[]
 			};
 		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo'])
 		},
+		onLoad(options){
+			console.log(options)
+			this.id=options.id
+		},
 		onShow() {
-			this.getIndexBuyData()
+			var that=this
+			this.$nextTick(function(){
+				that.getData()
+			})
+			
 			// this.userInfo =  uni.getStorageSync("userInfo")
-			this.warehouseInOutInfo.phone = this.userInfo.phone
 		},
 		onReachBottom() { //上拉触底函数
 			if (!this.isLoadMore) { //此处判断,上锁,防止重复请求
 				this.warehouseInOutInfo.currentPage += 1
-				this.getIndexBuyData()
+				this.Data()
 			}
 		},
 		methods: {
-			
+			getData(){
+				var data=[]
+				this.$api.doRequest('get', '/warehouseBaseInfo/selectContractNoList', 
+				{compId:this.pcUserInfo.compId,flag:3}).then(res => {
+					if(res.data.code==200){
+						for(var i=0;i<res.data.data.length;i++){
+							data.push({value:res.data.data[i].contractNo,label:res.data.data[i].contractNo})
+						}
+						this.contractNoList=data
+					}
+				})
+				this.$api.doRequest('get', '/saleOrder/getInfo', {id:this.id}).then(res => {
+					if(res.data.code==200){
+						this.list=res.data.data
+					}
+					})
+			},
+			confirm(item){
+				this.list.contractNo=item[0].value
+			},
+			audit(){
+				var that=this
+				uni.showModal({
+					content: "审核通过后,将通知客户订单生效,是否确定通过审核?",
+					showCancel: true,
+					confirmText: '提交',
+					success: function(res) {
+						if (res.confirm) {
+							that.$api.doRequest('post', '/saleOrder/api/editSaleOrder', that.list).then(res => {
+								if (res.data.code == 200) {
+									that.$api.doRequest('post', '/workflow/api/handle', {
+										taskId:that.list.taskId,
+										approved: true,
+										auditMind: '34',
+										needReapply: false,
+										}).then(res1 => {
+										if (res1.data.code == 200) {
+											that.$api.msg('审核成功');
+											that.$nextTick(function(){
+												uni.navigateBack(-1)
+											})
+										}else{
+											that.$api.msg(res1.data.message);
+										}
+									})
+								}else{
+											that.$api.msg(res.data.message);
+										}
+							})
+						}
+					}
+				})
+			}
 		}
 	}
 </script>

+ 1 - 1
pages/task/sale_details.vue

@@ -15,7 +15,7 @@
 				<u-input v-model="list.unitPrice" />
 			</u-form-item>
 			<u-form-item v-if='list.salePlanType=="期货"' label-width='260' label="基差(元/吨)">
-				{{basis}}
+				{{list.basis}}
 			</u-form-item>
 			<u-form-item v-if='list.salePlanType=="期货"' label-width='260' label="冻结定金(元)">
 				{{list.freezingDeposit}}