前端

config/index.js

@@ -10,7 +10,7 @@ const dev = {
 	// baseUrlNew: 'http://192.168.110.202:8090/',
 	// baseUrlNew: 'http://192.168.110.138:8090/',
 	// 上传图片的
-	// baseUrlNew: 'https://api2.eliangeyun.com/',
+	baseUrlNew: 'https://api2.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

pages/erpbusiness/add_quality_testing.vue

@@ -1062,9 +1062,9 @@
 					this.gridList.contractNo = this.taskNolist[e[0]].moveTaskNo
 				}
 				this.$api.doRequest('get', '/contractManagementInfo/getInContract', {
-					contractNo:this.gridList.contractNo,compId:'2710b21efc1e4393930c5dc800010dc4'
+					contractNo:this.gridList.contractNo,compId:uni.getStorageSync('pcUserInfo').compId
 				}).then(res => {
-					this.contractNolist=res
+					this.contractNolist=res.data.data
 						if (this.typevalue == 3) {
 							var gooddata = this.goodsList.filter((item) => {
 								return item.goodsName == this.contractNolist.goodsName
@@ -1124,6 +1124,7 @@
 						this.gridList.goodsNameKey = this.contractNolist.goodsNameKey
 						this.gridList.grade = this.contractNolist.grade
 						this.gridList.inOutType = this.contractNolist.inOutType
+						
 						if (this.gridList.inOutType == '采购入库') {
 							this.warehouseTradeCount = '000' + this.warehouseTradeCount
 							// this.gridList.qualityNo='CGRK'+this.getdate()+this.commonWarehouseNo+this.warehouseTradeCount.substring(this.warehouseTradeCount.length - 4)

pages/universalityAudit/addaduit.vue

@@ -45,6 +45,9 @@
 </template>
 
 <script>
+	import {
+		mapState
+	} from 'vuex';
 	import * as config from '../../config'
 	export default {
 		data() {
@@ -59,6 +62,9 @@
 		onShow(){
 			this.getList()
 		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo']),
+		},
 		watch: {
 			imglist: {
 				handler: function() {
@@ -140,6 +146,8 @@
 				}
 				
 				var that = this
+				this.dataobj.compId=uni.getStorageSync('pcUserInfo').compId
+				this.dataobj.sponsor=this.userInfo.userName
 				
 				uni.showModal({
 					content: '确定发起申请？',

pages/universalityAudit/list.vue

@@ -1,17 +1,17 @@
 <template>
 	<view>
 		<view class='wrap' v-for='item in datalist' @click='lookdetails(item)'>
-			<view>
+			<view style='display:flex;justify-content: space-between;'>
 				<view class='title'>
 					{{item.businessType}}
 				</view>
-				<view style='color:#FD714F;'>
+				<view v-if='item.approveStatus' style='color:#FD714F;'>
 					{{item.approveStatus?item.approveStatus:item.status}}
 				</view>
-				<view style='color:#FF4E4E;'>
+				<view v-if='item.status=="已驳回"' style='color:#FF4E4E;'>
 					{{item.approveStatus?item.approveStatus:item.status}}
 				</view>
-				<view style='color:#22C572;'>
+				<view v-if='item.status=="已通过"' style='color:#22C572;'>
 					{{item.approveStatus?item.approveStatus:item.status}}
 				</view>
 			</view>

pages/universalityAudit/look.vue

@@ -156,13 +156,13 @@
 					})
 					// 查流程
 					this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
-						businessCode: 'SHOU-CONTRACT-APPROVE',
+						businessCode: 'GENERAL-AUDIT-APPROVE',
 						tmpCompId: uni.getStorageSync('pcUserInfo').compId
 					}).then(res1 => {
 						this.$api.doRequest('get', '/commonUser/getHis', {
 							workflowId: res1.data.data[0].id,
 							businessKey: this.id,
-							branch:that.list.jointVentureParties?that.list.jointVentureParties:'zt'
+							branch:that.dataobj.businessType?that.dataobj.businessType:'zt'
 						}).then(response => {
 							uni.hideLoading()
 							for (let i = 0; i < response.data.data.length; i++) {