云南bug修改

src/main/resources/static/app/business/agent/bgz/bgmxz/controller/agentBgmxzCtrl.js

@@ -99,25 +99,18 @@ angular.module('app.business')
         // 同步代储库保管明细账数据
         $scope.synchro = function() {
         	//查询代储库仓房货位信息
-        	agentBgmxzService.selectAgentHouseWareList($rootScope.orgInfo.orgId).then(function (data) {
+        	agentBgmxzService.selectAgentHouseWareList($rootScope.orgInfo.orgId,"fcbgz").then(function (data) {
                 //console.log(data);
         		if(data != null && "" != data){
                     //把数据传到出入库用做条件拿到明细账数据传回来
-        			fcbgzService.queryFcbgzData(angular.toJson(data)).then(function (fcbgzData) {
-        				//console.log(fcbgzData);
-        				//把传回来的数据在插入到代储点的保管明细账表中
-        				if (null != fcbgzData && "" != fcbgzData) {
-        					agentBgmxzService.addCrkFcbgzData(angular.toJson(fcbgzData), $rootScope.orgInfo.orgId, $rootScope.userInfo.realName).then(function(agentBgmxzData){
+                    //把传回来的数据在插入到代储点的保管明细账表中
+                    agentBgmxzService.addCrkFcbgzData(angular.toJson(data), $rootScope.orgInfo.orgId, $rootScope.userInfo.realName).then(function(agentBgmxzData){
 //        						alert(agentBgmxzData.msg);
 //        						if (agentBgmxzData.status == "200") {
 //        						}
-        						$scope.loadData();
-        					},function(agentBgmxzData){
-        						console.log(agentBgmxzData);
-        					});
-        				}
-                    },function(fcbgzData){
-                        console.log(fcbgzData);
+                        $scope.loadData();
+                    },function(agentBgmxzData){
+                        console.log(agentBgmxzData);
                     });
                 }
             },function(data){

src/main/resources/static/app/business/agent/bgz/bgmxz/service/agentBgmxzService.js

@@ -85,13 +85,14 @@ angular.module('app.business')
         };
 
         //查询代储库正常使用的货位数据信息
-        this.selectAgentHouseWareList = function(orgId){
+        this.selectAgentHouseWareList = function(orgId,stateType){
             var d = $q.defer();
             $http({
                 method: 'GET',
                 url: APP_CONFIG.agentUrl + '/agent_bgmxz/selectAgentHouseWareList',
                 params: {
-                	orgId: orgId
+                	orgId: orgId,
+                    stateType: stateType
                 }
             }).then(function successCallback(response) {
                 // 请求成功执行代码

src/main/resources/static/app/business/agent/grainStorage/controller/hcCtrl.js

@@ -103,17 +103,11 @@ angular.module('app.business')
         	agentHcService.selectAgentHouseWareList($rootScope.orgInfo.orgId).then(function (data) {
         		if(data != null && "" != data){
                     //把数据传到出入库用做条件拿到明细账数据传回来
-        			crkRecordService.queryHcCrkRecordData(angular.toJson(data)).then(function (hccrkData) {
-        				//把传回来的数据在插入到代储点的火车出入库记录表中
-        				if (null != hccrkData && "" != hccrkData) {
-        					agentHcService.editHcCrkRecordData(angular.toJson(hccrkData), $rootScope.orgInfo.orgId, $rootScope.userInfo.realName).then(function(agentHcData){
-        						$scope.loadData();
-        					},function(agentHcData){
-        						console.log(agentHcData);
-        					});
-        				}
-                    },function(hccrkData){
-                        console.log(hccrkData);
+                    //把传回来的数据在插入到代储点的火车出入库记录表中
+                    agentHcService.editHcCrkRecordData(angular.toJson(data), $rootScope.orgInfo.orgId, $rootScope.userInfo.realName).then(function(agentHcData){
+                        $scope.loadData();
+                    },function(agentHcData){
+                        console.log(agentHcData);
                     });
                 }
             },function(data){

src/main/resources/static/app/business/agent/grainStorage/controller/numberCtrl.js

@@ -83,25 +83,19 @@ angular.module('app.business')
         // 同步代储库保管明细账数据
         $scope.synchro = function() {
         	//查询代储库仓房货位信息
-        	agentBgmxzService.selectAgentHouseWareList($rootScope.orgInfo.orgId).then(function (data) {
+        	agentBgmxzService.selectAgentHouseWareList($rootScope.orgInfo.orgId,"kcsw").then(function (data) {
         		if(data != null && "" != data){
                     //把数据传到出入库用做条件拿到明细账数据传回来
-        			kcswService.queryKcswData(angular.toJson(data)).then(function (kcswData) {
-        				//把传回来的数据在插入到代储点的保管明细账表中
-        				if (null != kcswData && "" != kcswData) {
-        					agentNumberService.editCrkKcswData(angular.toJson(kcswData), $rootScope.orgInfo.orgId, $rootScope.userInfo.realName).then(function(agentNumberData){
+                    //把传回来的数据在插入到代储点的保管明细账表中
+                    agentNumberService.editCrkKcswData(angular.toJson(data), $rootScope.orgInfo.orgId, $rootScope.userInfo.realName).then(function(agentNumberData){
 //        						alert(agentNumberData.msg);
 //        						if (agentNumberData.status == "200") {
 //        						}
-        						$scope.loadData();
-        					},function(agentNumberData){
-        						console.log(agentNumberData);
-        					});
-        				}
-                    },function(kcswData){
-                        console.log(kcswData);
+                        $scope.loadData();
+                    },function(agentNumberData){
+                        console.log(agentNumberData);
                     });
-                }
+                    }
             },function(data){
                 console.log(data);
             });

src/main/resources/static/app/business/agent/grainStorage/controller/qcCtrl.js

@@ -76,7 +76,7 @@ angular.module('app.business')
         }
 
         // 修改或者查看用户信息
-        $scope.showEdit = function(id,type, sjly, ywlx) {
+        $scope.showEdit = function(id,type, sjly, ywlx,agentOrgId) {
         	if (sjly == "1") {
         		// 汽车出入库详情
         		if ("汽车入库" == ywlx) {
@@ -86,7 +86,8 @@ angular.module('app.business')
         		}
         		$scope.obj = {
         			bizNo : id,
-        			ywlx : ywlx
+        			ywlx : ywlx,
+                    agentOrgId : agentOrgId
         		};
         		$state.go('app.supervise.operation.detail', {obj : angular.toJson($scope.obj)});
         	} else {
@@ -117,17 +118,11 @@ angular.module('app.business')
         	agentQcService.selectAgentHouseWareList($rootScope.orgInfo.orgId).then(function (data) {
         		if(data != null && "" != data){
                     //把数据传到出入库用做条件拿到明细账数据传回来
-        			crkRecordService.queryQcCrkRecordData(angular.toJson(data)).then(function (qccrkData) {
-        				//把传回来的数据在插入到代储点的汽车出入库记录表中
-        				if (null != qccrkData && "" != qccrkData) {
-        					agentQcService.editQcCrkRecordData(angular.toJson(qccrkData), $rootScope.orgInfo.orgId, $rootScope.userInfo.realName).then(function(agentQcData){
-        						$scope.loadData();
-        					},function(agentQcData){
-        						console.log(agentQcData);
-        					});
-        				}
-                    },function(qccrkData){
-                        console.log(qccrkData);
+                    //把传回来的数据在插入到代储点的汽车出入库记录表中
+                    agentQcService.editQcCrkRecordData(angular.toJson(data), $rootScope.orgInfo.orgId, $rootScope.userInfo.realName).then(function(agentQcData){
+                        $scope.loadData();
+                    },function(agentQcData){
+                        console.log(agentQcData);
                     });
                 }
             },function(data){

src/main/resources/static/app/business/agent/grainStorage/views/hc-list.html

@@ -120,9 +120,14 @@
                                         <td>{{hc.warehouseName}}</td>
                                         <td>{{hc.crkTime | date:'yyyy-MM-dd'}}</td>
                                         <td>
-                                            <a href-void ng-click="showEdit(hc.id,'edit')"><i class="fa fa-edit"></i>修改</a>
-                                            <a href-void ng-click="remove(hc.id)"><i class="fa fa-trash-o"></i>删除</a>
+                                            <a href-void ng-hide="hc.sjly==1" ng-click="showEdit(hc.id,'edit')"><i class="fa fa-edit"></i>修改</a>
+                                            <a href-void ng-hide="hc.sjly==1" ng-click="remove(hc.id)"><i class="fa fa-trash-o"></i>删除</a>
+                                            <span ng-if="hc.sjly==1">
+                                            <a href-void ng-click="showEdit(hc.businessNumber,'detail','1',hc.businessType)"><i class="fa fa-info-circle"></i>查看</a>
+                                            </span>
+                                            <span ng-if="hc.sjly!=1">
                                             <a href-void ng-click="showEdit(hc.id,'detail')"><i class="fa fa-info-circle"></i>查看</a>
+                                            </span>
                                         </td>
                                     </tr>
                                     </tbody>

src/main/resources/static/app/business/agent/grainStorage/views/number-list.html

@@ -104,9 +104,14 @@
                                         <td>{{dicData[number.harvestYear]}}</td>
                                         <td>{{number.inventory}}</td>
                                         <td>
-                                            <a href-void ng-click="showEdit(number.id,'edit')"><i class="fa fa-edit"></i>修改</a>
-                                            <a href-void ng-click="remove(number.id)"><i class="fa fa-trash-o"></i>删除</a>
+                                            <a href-void ng-hide="number.sjly==1" ng-click="showEdit(number.id,'edit')"><i class="fa fa-edit"></i>修改</a>
+                                            <a href-void ng-hide="number.sjly==1" ng-click="remove(number.id)"><i class="fa fa-trash-o"></i>删除</a>
+                                            <span ng-if="number.sjly==1">
+                                            <a href-void ng-click="showEdit(number.businessNumber,'detail','1',number.businessType)"><i class="fa fa-info-circle"></i>查看</a>
+                                            </span>
+                                            <span ng-if="number.sjly!=1">
                                             <a href-void ng-click="showEdit(number.id,'detail')"><i class="fa fa-info-circle"></i>查看</a>
+                                            </span>
                                         </td>
                                     </tr>
                                     </tbody>

src/main/resources/static/app/business/agent/grainStorage/views/qc-list.html

@@ -120,10 +120,10 @@
                                         <td>{{qc.warehouseName}}</td>
                                         <td>{{qc.crkTime | date:'yyyy-MM-dd'}}</td>
                                         <td>
-                                            <a href-void ng-click="showEdit(qc.id,'edit')"><i class="fa fa-edit"></i>修改</a>
-                                            <a href-void ng-click="remove(qc.id)"><i class="fa fa-trash-o"></i>删除</a>
+                                            <a href-void ng-hide="qc.sjly==1" ng-click="showEdit(qc.id,'edit')"><i class="fa fa-edit"></i>修改</a>
+                                            <a href-void ng-hide="qc.sjly==1" ng-click="remove(qc.id)"><i class="fa fa-trash-o"></i>删除</a>
                                             <span ng-if="qc.sjly==1">
-                                            <a href-void ng-click="showEdit(qc.businessNumber,'detail','1',qc.businessType)"><i class="fa fa-info-circle"></i>查看</a>
+                                            <a href-void ng-click="showEdit(qc.businessNumber,'detail','1',qc.businessType,qc.agentOrgId)"><i class="fa fa-info-circle"></i>查看</a>
                                             </span>
                                             <span ng-if="qc.sjly!=1">
                                             <a href-void ng-click="showEdit(qc.id,'detail')"><i class="fa fa-info-circle"></i>查看</a>

src/main/resources/static/app/intelligent/aeration/views/aerationJob-list.html

@@ -75,7 +75,7 @@
 												 <p ng-if="aerationJob.taskState==2">结束</p>
 											</td>
 											<td>{{aerationJob.creator}}</td>
-											<td>{{aerationJob.creationTime}}</td>
+											<td>{{aerationJob.creationTime | date:'yyyy-MM-dd HH:mm:ss' }}</td>
 											<td>
 													<a has-permission="401" has-botton="2" href-void ng-click="remove(aerationJob.id)" ng-show="aerationJob.taskState==0">
 														<i class="fa fa-trash-o"></i>删除

src/main/resources/static/app/intelligent/energyMonitor/views/dailyConsumption-list.html

@@ -62,7 +62,8 @@
                                         <td style="text-align:center;">{{ energy.vNhCode }}</td>
                                         <td style="text-align:center;">{{ energy.fTotalNh<0?0:energy.fTotalNh | number:2}}</td>
                                         <!-- <td style="text-align:center;">{{ dicData[energy.vHhtype]}}</td> -->
-                                        <td style="text-align:center;">{{ energy.vUpdateTime | limitTo:10 }}</td>
+<!--                                        <td style="text-align:center;">{{ energy.vUpdateTime | limitTo:10 }}</td>-->
+                                        <td style="text-align:center;">{{ energy.vUpdateTime | date:'yyyy-MM-dd HH:mm:ss' }}</td>
                                     </tr>
                                     </tbody>
 

src/main/resources/static/app/intelligent/fumigation/views/homework/fumHomeWorkSingle-list.html

@@ -65,7 +65,7 @@
                                         <td style="text-align:center;">{{ dicData[homeWorkQuery.fumigationType] }}</td>
                                         <td style="text-align:center;">{{ dicData[homeWorkQuery.drugName] }}</td>
                                         <td style="text-align:center;">{{ userInfoData[homeWorkQuery.creater] }}</td>
-                                        <td style="text-align:center;">{{ homeWorkQuery.createTime }}</td>
+                                        <td style="text-align:center;">{{ homeWorkQuery.createTime | date:'yyyy-MM-dd HH:mm:ss' }}</td>
                                         <td style="text-align:center;">
                                             <a href-void ng-click="getHomeWorkQueryEdit(homeWorkQuery.planType,homeWorkQuery.id)"><i class=""></i>详情</a>
                                         </td>

src/main/resources/static/app/intelligent/fumigation/views/plan/fumigation-list.html

@@ -75,7 +75,7 @@
                                             </div>
                                         </td>
                                         <td style="text-align:center;">{{ planQuery.state }}</td>
-                                        <td style="text-align:center;">{{ planQuery.createTime }}</td>
+                                        <td style="text-align:center;">{{ planQuery.createTime | date:'yyyy-MM-dd HH:mm:ss' }}</td>
                                         <td style="text-align:center;">
                                             <a href-void ng-click="getPlanQueryEdit(planQuery.planType,planQuery.id,planQuery.state,'detail')"><i class=""></i>详情</a>
                                         </td>

src/main/resources/static/app/intelligent/fumigation/views/plan/fumigationApprove-list.html

@@ -59,7 +59,7 @@
                                         <td style="text-align:center;">{{ dicData[fumigationApprove.drugName] }}</td>
                                         <td style="text-align:center;">{{ dicData[fumigationApprove.fumigationType] }}</td>
                                         <td style="text-align:center;">{{ fumigationApprove.fumigationCommand }}</td>
-                                        <td style="text-align:center;">{{ fumigationApprove.createTime }}</td>
+                                        <td style="text-align:center;">{{ fumigationApprove.createTime | date:'yyyy-MM-dd HH:mm:ss' }}</td>
                                         </td>
                                         <td style="text-align:center;">
                                             <span has-botton="2" ng-if="fumigationApprove.result=='待审批'">

src/main/resources/static/app/intelligent/fumigation/views/plan/fumigationPlan-list.html

@@ -61,7 +61,7 @@
                                         <td style="text-align:center;">{{ dicData[fumigationPlan.fumigationType] }}</td>
                                         <td style="text-align:center;">{{ fumigationPlan.fumigationNumber }}</td>
                                         <td style="text-align:center;">{{ fumigationPlan.fumigationCommand }}</td>
-                                        <td style="text-align:center;">{{ fumigationPlan.createTime }}</td>
+                                        <td style="text-align:center;">{{ fumigationPlan.createTime | date:'yyyy-MM-dd HH:mm:ss' }}</td>
                                         <td style="text-align:center;"><div ng-switch="{{fumigationPlan.state}}">
                                             <div ng-switch-when="1"><span style='text-align:center;color:green;'>未提交</span></div>
                                             <div ng-switch-when="2"><span style='text-align:center;color:blue;'>待审批</span></div>

src/main/resources/static/app/intelligent/fumigation/views/plan/pesticideApprove-list.html

@@ -57,7 +57,7 @@
                                         <td style="text-align:center;">{{ dicData[pesticideApprove.majorInsectPests] }}</td>
                                         <td style="text-align:center;">{{ dicData[pesticideApprove.drugName] }}</td>
                                         <td style="text-align:center;">{{ pesticideApprove.useDrugType }}</td>
-                                        <td style="text-align:center;">{{ pesticideApprove.createTime }}</td>
+                                        <td style="text-align:center;">{{ pesticideApprove.createTime | date:'yyyy-MM-dd HH:mm:ss' }}</td>
                                         </td>
                                         <td style="text-align:center;">
                                             <span has-botton="2" ng-if="pesticideApprove.result=='待审批'">

src/main/resources/static/app/intelligent/fumigation/views/plan/pesticidePlan-list.html

@@ -61,7 +61,7 @@
                                         <td style="text-align:center;">{{ dicData[pesticidePlan.majorInsectPests] }}</td>
                                         <td style="text-align:center;">{{ dicData[pesticidePlan.drugName] }}</td>
                                         <td style="text-align:center;">{{ pesticidePlan.useDrugType }}</td>
-                                        <td style="text-align:center;">{{ pesticidePlan.createTime }}</td>
+                                        <td style="text-align:center;">{{ pesticidePlan.createTime | date:'yyyy-MM-dd HH:mm:ss' }}</td>
                                         <td style="text-align:center;">
                                             <div ng-switch="{{pesticidePlan.state}}">
                                                 <div ng-switch-when="1"><span style='text-align:center;color:green;'>未提交</span></div>

src/main/resources/static/app/intelligent/grainNumberMonitor/views/warningHistory.html

@@ -72,7 +72,7 @@
                                         <td style="text-align:center;">{{warningHistory.depotLong}}</td>
                                         <td style="text-align:center;">{{warningHistory.depotWide}}</td>
                                         <td style="text-align:center;">{{warningHistory.avgHeightv}}</td>
-                                        <td style="text-align:center;">{{warningHistory.monitorTime}}</td>
+                                        <td style="text-align:center;">{{warningHistory.monitorTime | date:'yyyy-MM-dd HH:mm:ss' }}</td>
                                         <td style="text-align:center;">{{warningHistory.operator}}</td>
                                     </tr>
                                     </tbody>

src/main/resources/static/app/supervise/controller/crkRecordCtrl.js

@@ -76,9 +76,10 @@ angular.module('app.supervise').controller("crkRecordCtrl",
 
         $scope.crkType = {"1":"入库","3":"出库"};
         $scope.obj = angular.fromJson($stateParams.obj);
+        var orgId = $rootScope.orgInfo.orgId;
         // 火车出入库详情
         if ('火车入仓' == $scope.obj.ywlx || '火车出仓' == $scope.obj.ywlx) {
-            crkRecordService.getTrainDetail($scope.obj.bizNo, $rootScope.orgInfo.orgId).then(function (data) {
+            crkRecordService.getTrainDetail($scope.obj.bizNo, orgId).then(function (data) {
                 //称重信息
                 $scope.czxx = data.czxx;
                 //质检信息
@@ -87,19 +88,22 @@ angular.module('app.supervise').controller("crkRecordCtrl",
                 // console.log(data);
             });
         } else {
+            if(typeof($scope.obj.agentOrgId) !=="undefined" || $scope.obj.agentOrgId !=='' || $scope.obj.agentOrgId !==null){
+                orgId = $scope.obj.agentOrgId
+            }
             // 汽车出入库详情
-        	crkRecordService.getDetail($scope.obj.bizNo, $rootScope.orgInfo.orgId, $scope.obj.ywlx).then(function(data){
-        		//称重信息
-        		$scope.czxx = data.czxx;
-        		//质检信息
-        		$scope.zjxx = data.zjxx;
-        		//出库不显示质检信息
-        		if ($scope.obj.ywlx == "出仓") {
-        			$scope.isNotEdit = true;
-        		}
-        	},function(data){
-        		console.log(data);
-        	});
+            crkRecordService.getDetail($scope.obj.bizNo, orgId, $scope.obj.ywlx).then(function(data){
+                //称重信息
+                $scope.czxx = data.czxx;
+                //质检信息
+                $scope.zjxx = data.zjxx;
+                //出库不显示质检信息
+                if ($scope.obj.ywlx == "出仓") {
+                    $scope.isNotEdit = true;
+                }
+            },function(data){
+                console.log(data);
+            });
         }
         //返回上一个链接页面
         $scope.returnUp = function(){