ccj 2 năm trước cách đây
mục cha
commit
d89e0522e8
4 tập tin đã thay đổi với 18 bổ sung5 xóa
  1. 1 1
      config/index.js
  2. 2 2
      manifest.json
  3. 3 0
      pages/task/audit/acquisitioncontract.vue
  4. 12 2
      pages/task/my_task.vue

+ 1 - 1
config/index.js

@@ -4,7 +4,7 @@ const dev = {
 	baseUrlNew: 'http://192.168.110.67:9100/',
 	// baseUrlNew: 'http://192.168.1.118:8090/',
 	// baseUrlNew: 'http://192.168.110.9:9100/',
-	baseUrlNew: 'http://192.168.110.138:8090/',
+	// baseUrlNew: 'http://192.168.110.138:8090/',
 	// baseUrlNew: 'http://192.168.110.82:8099/',
 	 // baseUrlNew: 'http://192.168.110.82:8090/',
 	// baseUrlNew: 'http://192.168.110.202:8090/',

+ 2 - 2
manifest.json

@@ -2,8 +2,8 @@
     "name" : "易粮易运",
     "appid" : "__UNI__7297DA2",
     "description" : "易粮易运——为天下粮食人服务的App",
-    "versionName" : "2.1.146",
-    "versionCode" : 21146,
+    "versionName" : "2.1.148",
+    "versionCode" : 21148,
     "transformPx" : false,
     /* SDK配置 */
     "quickapp" : {},

+ 3 - 0
pages/task/audit/acquisitioncontract.vue

@@ -583,6 +583,9 @@
 							
 									}
 									console.log(response.data.data)
+									if(response.data.data.length == 0 ){
+										this.auditCheck = "success"
+									}
 									for(let i = 0 ;i<response.data.data.length;i++){
 										if(response.data.data[i].status == "error"){
 											this.auditCheck = "error"

+ 12 - 2
pages/task/my_task.vue

@@ -11,6 +11,7 @@
 					<view @click='tabcarchange(1)' class='line' :class='statusFlag==1?"active":""'>未完成</view>
 					<view @click='tabcarchange(3)' class='line' :class='statusFlag==3?"active":""'>已完成</view>
 					<view @click='tabcarchange(5)' class='line' :class='statusFlag==5?"active":""'>已发起</view>
+					<view @click='tabcarchange(7)' class='line' :class='statusFlag==7?"active":""'>抄送</view>
 				</view>
 				<view class="right">
 				<!-- 	<view class="right-contrent1">逐条审核</view>
@@ -82,7 +83,8 @@
 				},
 				data: {},
 				keyword: "",
-				copyTaskInfo: []
+				copyTaskInfo: [],
+				pcUserInfo:{}
 			};
 		},
 		onBackPress(e) {
@@ -217,6 +219,7 @@
 			// this.warehouseInOutInfo.phone = this.userInfo.phone
 		},
 		onLoad() {
+			this.pcUserInfo = uni.getStorageSync("pcUserInfo")
 			if (uni.getStorageSync("everyTask") == true) {
 				this.checked = true
 			} else {
@@ -383,7 +386,14 @@
 					data.searchKeyword = searchKeyword
 					url = '/commonUser/query/findHisPageNoticeTasksMy'
 				}
-
+				else if (this.statusFlag == 7) {
+					data.currentPage = pages
+					data.pageSize = limit
+					data.acceptId = this.userInfo.phone
+					data.compId = this.pcUserInfo.compId
+					data.searchKeyword = searchKeyword
+					url = '/noticeCopyInfo/getNotice'
+				}
 				//this.warehouseInOutInfo.status = this.status
 				this.$api.doRequest('get', url, data).then(res => {
 					if (res.data.code == 200) {