供应商登录

WebAPIBase.NetCore/WebAPIBase.NetCore.BusinessCore/BaseCore/zzSupplierExManager.cs

@@ -21,5 +21,12 @@ public  class zzSupplierExManager : DbContext<zzSupplierEx>
         return list;
     }
 
+    public List<zzSupplierExDTO> GetzzSupplierExDTOList(string supplierCode)
+    {
+        var sql = $"SELECT a.*,b.ProjectName FROM dbo.zzSupplierEx a INNER JOIN dbo.Project b ON a.ProjectCode=b.ProjectCode where a.supplierCode='{supplierCode}' order by a.createdate desc  ";
+        var list = Db.Ado.SqlQuery<zzSupplierExDTO>(sql);
+        return list;
+    }
+
 }
  

WebAPIBase.NetCore/WebAPIBase.NetCore.Enties/DbModels/zzSupplierEx.cs

@@ -55,6 +55,7 @@ namespace Sugar.Enties
         /// <summary>
         /// 审核时间
         /// </summary>
+        [SugarColumn(IsOnlyIgnoreInsert = true)]
         public DateTime? CheckDate { get; set; }
 
         /// <summary>
@@ -62,13 +63,14 @@ namespace Sugar.Enties
         /// Default:
         /// Nullable:False
         /// </summary>           
+        [SugarColumn(IsOnlyIgnoreInsert = true,IsOnlyIgnoreUpdate =true)]
         public DateTime CreateDate { get; set; }
     }
 
     public class zzSupplierExDTO
     {
-       
 
+        public int ID { get; set; }
         /// <summary>
         /// Desc:供应商编码
         /// Default:
@@ -92,8 +94,17 @@ namespace Sugar.Enties
         /// 项目编码
         /// </summary>
         public string ProjectCode { get; set; }
+        public string ProjectName { get; set; }
 
-        
+        public int State { get; set; }
+        public string StateName
+        {
+            get
+            {
+                var type = typeof(CheckState);
+                return type.GetEnumName(State);
+            }
+        }
 
         /// <summary>
         /// 审核人
@@ -104,12 +115,35 @@ namespace Sugar.Enties
         /// 审核时间
         /// </summary>
         public DateTime? CheckDate { get; set; }
+        public string CheckDateStr 
+        { 
+            get
+            {
+                if(CheckDate!=null)
+                {
+                    return CheckDate.Value.ToString("yyyy-MM-dd");
+                }
+                else
+                {
+                    return "";
+                }
+            } 
+        }
 
         /// <summary>
         /// Desc:创建日期
         /// Default:
         /// Nullable:False
         /// </summary>           
-        public DateTime? CreateDate { get; set; }
+        public DateTime CreateDate { get; set; }
+        public string CreateDateStr
+        {
+            get
+            {
+
+                return CreateDate.ToString("yyyy-MM-dd");
+
+            }
+        }
     }
 }

WebAPIBase.NetCore/WebAPIBase.NetCore/Controllers/CommonController.cs

@@ -120,6 +120,7 @@ namespace WebAPIBase.API.Controllers
         /// </summary>
         /// <param name="formCollection"></param>
         /// <returns></returns>
+        [AllowAnonymous]
         [HttpPost]
         [DisableRequestSizeLimit]      //禁用大小限制
         [Route("UploadImage")]

WebAPIBase.NetCore/WebAPIBase.NetCore/Controllers/RequisitionController.cs

@@ -232,7 +232,7 @@ namespace WebAPIBase.API.Controllers
             try
             {
                 var service = new zzSupplierExManager();
-                var list = service.GetList(m => m.SupplierCode == supplierCode);
+                var list = service.GetzzSupplierExDTOList(supplierCode);
                
                 return Json(list);
             }
@@ -353,6 +353,8 @@ namespace WebAPIBase.API.Controllers
             }
             try
             {
+                dto.CheckDate = null;
+                dto.CheckPerson = "";
                 var service = new zzSupplierExManager();
                 var id = service.Db.Insertable(dto).ExecuteReturnIdentity();
                 if(id>0)

WebAPIBase.NetCore/WebAPIBase.NetCore/Controllers/UserController.cs

@@ -276,36 +276,36 @@ namespace WebAPIBase.API.Controllers
             Console.WriteLine("【LoginSupplier】request:" + JsonConvert.SerializeObject(request));
 
             #region 公司授权           
-            var validateResult = HttpClientHelper.DoPost(validServiceUrl + "/api/user");
-            Console.WriteLine($"【LoginSupplier】validateResult:{validateResult}");
-            logger.Info($"【LoginSupplier】:{validateResult}");
-            if (validateResult == "")
-            {
-                var res1 = new ApiResponse
-                {
-                    Code = 200,
-                    IsSuccess = false,
-                    ErrMsg = "授权失败"
-
-                };
-                return Json(res1);
-            }
-            else
-            {
-                var resAuthorize = JsonConvert.DeserializeObject<ApiResponse>(validateResult);
-                if (!resAuthorize.IsSuccess)
-                {
-                    var res1 = new ApiResponse
-                    {
-                        Code = 200,
-                        IsSuccess = false,
-                        ErrMsg = "授权失败"
-
-                    };
-                    return Json(res1);
-                }
-                logger.Info($"【授权成功】:{validateResult}");
-            }
+            //var validateResult = HttpClientHelper.DoPost(validServiceUrl + "/api/user");
+            //Console.WriteLine($"【LoginSupplier】validateResult:{validateResult}");
+            //logger.Info($"【LoginSupplier】:{validateResult}");
+            //if (validateResult == "")
+            //{
+            //    var res1 = new ApiResponse
+            //    {
+            //        Code = 200,
+            //        IsSuccess = false,
+            //        ErrMsg = "授权失败"
+
+            //    };
+            //    return Json(res1);
+            //}
+            //else
+            //{
+            //    var resAuthorize = JsonConvert.DeserializeObject<ApiResponse>(validateResult);
+            //    if (!resAuthorize.IsSuccess)
+            //    {
+            //        var res1 = new ApiResponse
+            //        {
+            //            Code = 200,
+            //            IsSuccess = false,
+            //            ErrMsg = "授权失败"
+
+            //        };
+            //        return Json(res1);
+            //    }
+            //    logger.Info($"【授权成功】:{validateResult}");
+            //}
             #endregion
 
            

uni-app-front/pages/template/InsertzzSupplierEx/InsertzzSupplierEx.vue

@@ -177,14 +177,14 @@
 					return;
 				}
 				let requisitionType=this.$util.getQuery("type")-0;
-				var dto={id:0,title:this.title,projectCode:this.projectCode,supplierCode:this.supplierCode,reason:this.reason,state:0,checkPerson:'',checkDate:null,createDate:null};
+				var dto={title:this.title,projectCode:this.projectCode,supplierCode:this.supplierCode,reason:this.reason,checkPerson:''};
 			 
 				console.info('dto',dto);
 				//return;
-				var data={dto:dto};
+				//var data={dto:dto};
 				//var strList=JSON.stringify(list);
 				//var strData=JSON.stringify(data);
-				InsertzzSupplierEx(data).then((res)=>{
+				InsertzzSupplierEx(dto).then((res)=>{
 					console.info("插入结果",res);
 					
 					if(res){
@@ -192,7 +192,7 @@
 						_this.uploadFileToServe(res) ;
 						
 						uni.navigateTo({
-							url:'/pages/template/supplierlist/supplierlist'
+							url:'/pages/template/SupplierList/SupplierList'
 						})
 					}
 					else{
@@ -236,33 +236,7 @@
 			},
 			
 			openWindow:function(){
-				let _this=this;
-				console.info('监听事件外部this');
-				console.info(this);
-				this.saveTemp(_this);
-				
-				//创建名字为fire的监听器，监听子页面传值事件
-				uni.$once('fire', function(data) {
-					console.info("监听fire子页面的传值",data);
-					//修改数据
-					_this.contractList=[];
-					data.forEach(function(item,index,array){
-						//console.info("foreach");				
-						_this.$set(_this.contractList,index,item);
-					});	
-					uni.setStorage({
-						key:'contractList',
-						data:_this.contractList
-					});
-					//dom还没更新						
-					 _this.getTemp(_this);
-					_this.needFormCach=true;
-					console.info("监听子页面的传值结束");	
-				});	
-				//打开子页面
-				uni.navigateTo({
-					url:"/pages/template/GetRelationContract/GetRelationContract"
-				})
+				 
 			},
 			
 			
@@ -333,7 +307,7 @@
 			
 				//return;
 				for (let i = 0; i < urlList.length; i++) {
-			
+			        console.info('x-token',_this.$store.state.token.tokenStr);
 					uni.uploadFile({
 						url: '/api/Common/UploadImage', 
 						filePath: urlList[i],
@@ -344,7 +318,8 @@
 							attachMentType:'zzSupplierExAttach'
 						},
 						headers: {
-							'Content-Type': 'multipart/form-data; boundary = ' + new Date().getTime()
+							'Content-Type': 'multipart/form-data; boundary = ' + new Date().getTime(),
+							'X-Token':_this.$store.state.token.tokenStr
 							//这里要把content-type设置为multipard/form-data，同时还要设置boundary
 						},
 						success: (uploadFileRes) => {

uni-app-front/pages/template/SupplierList/SupplierList.vue

@@ -5,23 +5,23 @@
 				<view slot="body" class="slot-box">
 					<view class="row">
 						<view class="column-left">编号：</view>
-						<view class="column-right section-title">{{item.requisitionNumber}}</view>
+						<view class="column-right section-title">{{item.id}}</view>
 					</view>
 					<view class="row">
 						<view class="column-left">标题：</view>
-						<view class="column-right">{{item.requisitionName}}</view>
+						<view class="column-right">{{item.title}}</view>
 					</view>
 					<view class="row">
 						<view class="column-left">原因：</view>
-						<view class="column-right">{{item.changeType}}</view>
+						<view class="column-right">{{item.reason}}</view>
 					</view>
 					<view class="row">
 						<view class="column-left">项目：</view>
-						<view class="column-right">{{item.personName}}</view>
+						<view class="column-right">{{item.projectName}}</view>
 					</view>					
 					<view class="row" >
 						<view class="column-left">申请日期：</view>
-						<view class="column-right">{{item.requisitionDate}}</view>
+						<view class="column-right">{{item.createDateStr}}</view>
 					</view>
 					<view class="row">
 						<view class="column-left">当前状态：</view>