Commit 902d5eb0 authored by suichenguang's avatar suichenguang

Merge remote-tracking branch 'origin/dev' into dev

parents 9d1d77a8 31146e81
......@@ -320,6 +320,13 @@ public class AdminApi {
// }
// return map.toString();
// }
/**
* 添加角色
* @param jsonStr
* @param resp
* @return
*/
@RequestMapping("roleAdd")
public Map<String, String> roleAdd(@RequestBody String jsonStr, HttpServletResponse resp) {
resp.setCharacterEncoding("UTF-8");
......
......@@ -186,11 +186,10 @@ public class UserApi {
*
* @return
*/
@RequestMapping(value = "/addQuickCyclesheetInfo", method = RequestMethod.GET)
@RequestMapping(value = "/addQuickTask", method = RequestMethod.GET)
@RequiresPermissions("userInfo.add")//权限管理;
@ResponseBody
public String addQuickCyclesheetInfo(@RequestParam("id") String id, HttpServletResponse resp) {
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
int i = taskService.addQuickCyclesheetInfo(id);
......@@ -246,13 +245,31 @@ public class UserApi {
* @return
*/
@RequestMapping("addFailedinfo")
public String addFailedinfo(@RequestParam("id") String id, HttpServletResponse resp) {
String map = "[{\"failedinfoid\":\"20181016002\",\"failed_Reason\":1,\"groupno\":\"41108201\",\"cyclesheetid\":\"20181016001\"}]";
JSONArray jsonArray = JSONArray.fromObject(map);
public String addFailedinfo(@RequestParam("idNo") String idNo, HttpServletResponse resp) throws Exception {
JSONObject jsonObject = JSONObject.fromObject(idNo);
Map<String, List> map = jsonObject;
List<Map<String,String>> list = map.get("list");
List<FailedCardEntity> failedinfoEntityList = new ArrayList<>();
for (Object object : jsonArray) {
FailedCardEntity o = (FailedCardEntity) JSONObject.toBean((JSONObject) object, FailedCardEntity.class);
failedinfoEntityList.add(o);
for (Map<String,String> acceptMap : list) {
FailedCardEntity failedCardEntity = new FailedCardEntity();
String acceptNo = acceptMap.get("acceptNo");
failedCardEntity.setAccept_No(acceptNo);
failedCardEntity.setFailed_Card_Reason_Id(Long.valueOf(acceptMap.get("reson")));
List<FailedCardEntity> failedCardEntities = failedCardService.selectAcceptNoAtFailedCard(acceptNo);
List<SpecialCardEntity> specialCardEntities = failedCardService.selectAcceptNoAtSpecialCard(acceptNo);
List<GroupNoEntity> groupNoEntities = failedCardService.selectAcceptNoAtGroupNo(acceptNo.substring(0, 8));
if (failedCardEntities.size()!=0){
failedCardEntity.setTask_Id(failedCardEntities.get(0).getTask_Id());
}else if (specialCardEntities.size()!=0){
failedCardEntity.setTask_Id(specialCardEntities.get(0).getTask_Id());
}else if (groupNoEntities.size()!=0){
failedCardEntity.setTask_Id(groupNoEntities.get(0).getTask_Id());
}else {
throw new Exception("证件信息有误");
}
failedinfoEntityList.add(failedCardEntity);
}
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
......@@ -267,15 +284,17 @@ public class UserApi {
* @return
*/
@RequestMapping("updateFailedinfo")
@RequiresPermissions("userInfo.add")//权限管理;
public String updateFailedinfo(@RequestParam("id") String id, HttpServletResponse resp) {
String map = "[{\"failedinfoid\":\"201810302\",\"failed_Reason\":1,\"groupno\":\"411081\",\"cyclesheetid\":\"20181016001\"}]";
JSONArray jsonArray = JSONArray.fromObject(map);
// @RequiresPermissions("userInfo.add")//权限管理;
public String updateFailedinfo(@RequestParam("failedCardId") String id,@RequestParam("state") String state, HttpServletResponse resp) {
FailedCardEntity failedCardEntity = new FailedCardEntity();
failedCardEntity.setFailed_Card_Id(Long.valueOf(id));
failedCardEntity.setState(Long.valueOf(state));
List<FailedCardEntity> failedinfoEntityList = new ArrayList<>();
for (Object object : jsonArray) {
FailedCardEntity o = (FailedCardEntity) JSONObject.toBean((JSONObject) object, FailedCardEntity.class);
failedinfoEntityList.add(o);
}
// for (Object object : jsonArray) {
//// FailedCardEntity o = (FailedCardEntity) JSONObject.toBean((JSONObject) object, FailedCardEntity.class);
// failedinfoEntityList.add(o);
// }
failedinfoEntityList.add(failedCardEntity);
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
int i = failedCardService.updateFailedinfo(failedinfoEntityList);
......@@ -288,13 +307,15 @@ public class UserApi {
*
* @return
*/
@RequestMapping("findFailedinfo")
@RequiresPermissions("userInfo.add")//权限管理;
public String findFailedinfo(@RequestParam("id") String id, HttpServletResponse resp) {
@RequestMapping("findFailedList")
// @RequiresPermissions("userInfo.add")//权限管理;
public String findFailedList(@RequestParam("state") String state, HttpServletResponse resp) {
List<FailedCardEntity> failedList = failedCardService.findFailedList(state);
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
List<Map<String, Object>> maps = failedCardService.selectFailedinfo(valueOf(id));
yxjsonResponse.outPutSuccess(maps + "------添加成功---" + maps.size());
yxjsonResponse.outPutSuccess(failedList);
Map map = new HashMap();
// map.put("MakeType",productionTaskListEntity);
return yxjsonResponse.toJSONString();
}
......@@ -488,8 +509,8 @@ public class UserApi {
*/
@RequestMapping("getCardBody")
// @RequiresPermissions("userInfo.add")//权限管理;
public String insertCardBody(@RequestParam("cardBodyId") String cardbodyid, HttpServletResponse resp) {
List<CardBodyEntity> cardBodyEntity = cardBodyService.insertCardBody(cardbodyid);
public String getCardBody(@RequestParam("cardBodyId") String cardBodyId, HttpServletResponse resp) {
List<CardBodyEntity> cardBodyEntity = cardBodyService.findCardBody(cardBodyId);
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(cardBodyEntity);
......@@ -497,6 +518,22 @@ public class UserApi {
return yxjsonResponse.toJSONString();
}
/**
* 添加卡基表;
*
* @return
*/
@RequestMapping("addCardBody")
// @RequiresPermissions("userInfo.add")//权限管理;
public String addCardBody(@RequestParam("cardTypeId") String cardTypeId,@RequestParam("isActive") String isActive,@RequestParam("taskId") String taskId,@RequestParam("totalCount") String totalCount, HttpServletResponse resp) {
int i = cardBodyService.insertCardBody(cardTypeId,isActive,taskId,totalCount);
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(i + "添加成功");
Map map = new HashMap();
return yxjsonResponse.toJSONString();
}
/**
* 查询简易证件信息;
*
......@@ -508,10 +545,10 @@ public class UserApi {
JSONObject jsonObject = JSONObject.fromObject(idNo);
Map<String, List> jsonArray1 = (Map<String, List>)jsonObject;
List list = jsonArray1.get("list");
List<ProdCardEntity> taskEntity = prodCardService.getProdCard(list);
List<ProdCardEntity> prodCardEntity = prodCardService.getProdCard(list);
YXJSONResponse yxjsonResponse = new YXJSONResponse();
resp.setCharacterEncoding("UTF-8");
yxjsonResponse.outPutSuccess(taskEntity);
yxjsonResponse.outPutSuccess(prodCardEntity);
Map map = new HashMap();
return yxjsonResponse.toJSONString();
}
......@@ -552,7 +589,7 @@ public class UserApi {
*
* @return
*/
@RequestMapping("reviseStorageCount")
@RequestMapping("updateStorageCount")
// @RequiresPermissions("userInfo.add")//权限管理;
public String reviseStorageCount(@RequestParam("taskId") String taskId,@RequestParam("countyCode") String countyCode,@RequestParam("inStorageCount") String inStorageCount, @RequestParam("outStorageCount") String outStorageCount, HttpServletResponse resp) {
int i=countyListService.reviseStorageCount(taskId,countyCode, inStorageCount, outStorageCount);
......
......@@ -55,7 +55,7 @@ public class YingxinApi {
*
*
*/
@RequestMapping("getCbCountInfo")
@RequestMapping("getCardBodyCount")
public String getCbCountInfo(@RequestParam("startTime")String startTime ,@RequestParam("endTime")String endTime,HttpServletResponse resp) {
List<Map<String, Object>> list=cardBodyService.getCbCount(startTime, endTime);
YXJSONResponse yxjsonResponse = new YXJSONResponse();
......
......@@ -29,9 +29,8 @@ public class FailedCardEntity {
public void setFailed_Card_Id(long failed_Card_Id) {
this.failed_Card_Id = failed_Card_Id;
}
@Basic
@Column(name = "FAILED_CARD_REASON_ID", nullable = true, precision = 0)
@Column(name = "FAILED_CARD_REASON_ID", nullable = true)
public long getFailed_Card_Reason_Id() {
return failed_Card_Reason_Id;
}
......@@ -39,7 +38,6 @@ public class FailedCardEntity {
public void setFailed_Card_Reason_Id(long failed_Card_Reason_Id) {
this.failed_Card_Reason_Id = failed_Card_Reason_Id;
}
@Basic
@Column(name = "ACCEPT_NO", nullable = true, length = 20)
public String getAccept_No() {
......@@ -69,7 +67,7 @@ public class FailedCardEntity {
this.position_Date = position_Date;
}
@Basic
@Column(name = "FINISH_DATE", nullable = true, length = 20)
@Column(name = "FINSH_DATE", nullable = true, length = 20)
public Date getFinish_Date() {
return finish_Date;
}
......@@ -83,9 +81,6 @@ public class FailedCardEntity {
return allot_Date;
}
public void setAllot_Date(Date allot_Date) {
this.allot_Date = allot_Date;
}
......@@ -94,13 +89,11 @@ public class FailedCardEntity {
public Date getPrint_Date() {
return print_Date;
}
public void setPrint_Date(Date print_Date) {
this.print_Date = print_Date;
}
@Basic
@Column(name = "STATE", nullable = false, precision = 0)
public long getState() {
......
......@@ -45,7 +45,7 @@ public class ProdCardEntity {
}
@Basic
@Column(name = "specialType", nullable = false, precision = 0)
@Column(name = "specialType")
public long getSpecialType() {
return specialType;
}
......
......@@ -45,7 +45,7 @@ public class SpecialCardEntity {
this.task_Id = task_Id;
}
@Basic
@Column(name = "SPECIAL_TYPE", nullable = false, precision = 0)
@Column(name = "SPECIAL_TYPE", nullable = true)
public long getSpecial_Type() {
return special_Type;
}
......
......@@ -13,7 +13,8 @@ import java.util.Map;
@Mapper
public interface CardBodyMapper {
public List <CardBodyEntity> insertCardBody(String cardBodyId);
public List <CardBodyEntity> findCardBody(String cardBodyId);
public int insertCardBody(@Param("cardTypeId") String cardTypeId,@Param("isActive") String isActive,@Param("taskId") String taskId,@Param("totalCount") String totalCount);
// public int updateCardBody(CardBodyEntity map);
public List<Map<String,Object>> findCbCountByDealdateViewData(@Param("startTime")String startTime,@Param("endTime")String endTime );
public List<Map<String,Object>> findCbCountByDealdate();
......
package com.yxproject.start.mapper;
import com.yxproject.start.entity.FailedCardEntity;
import com.yxproject.start.entity.GroupNoEntity;
import com.yxproject.start.entity.SpecialCardEntity;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
......@@ -32,8 +34,30 @@ public interface FailedCardMapper {
* @return
*/
// @SelectProvider(type=com.yxproject.start.SqlProvider.SqlProvider.class,method="selectFailedinfoBycolumnName")
public List<Map<String,Object>> selectFailedCardEntityByState(int state);
public List<FailedCardEntity> findFailedList(String state);
/**
* 查询废证的任务单
* 在废证表中
* @param accept_No 废证受理号
* @return
*/
public List<FailedCardEntity> selectAcceptNoAtFailedCard(String accept_No);
/**
* 查询废证的任务单
* 在特证表中
* @param accept_No 废证受理号
* @return
*/
public List<SpecialCardEntity> selectAcceptNoAtSpecialCard(String accept_No);
/**
* 查询废证的任务单
* 在组号表中
* @param groupNo 废证受理组号
* @return
*/
public List<GroupNoEntity> selectAcceptNoAtGroupNo(String groupNo);
......
......@@ -10,7 +10,9 @@ import java.util.Map;
* Created by Administrator on 2018/11/7.
*/
public interface CardBodyService {
public List<CardBodyEntity> insertCardBody(String cardBodyId);
public List<CardBodyEntity> findCardBody(String cardBodyId);
public int insertCardBody(String cardTypeId,String isActive,String taskId,String totalCount);
public List<Map<String,Object>> getCbCount(String startTime,String endTime);
......
package com.yxproject.start.service;
import com.yxproject.start.entity.FailedCardEntity;
import com.yxproject.start.entity.GroupNoEntity;
import com.yxproject.start.entity.SpecialCardEntity;
import java.util.List;
import java.util.Map;
......@@ -11,5 +13,9 @@ import java.util.Map;
public interface FailedCardService {
public int saveFailedinfo(List<FailedCardEntity> failedinfoEntityList);
public int updateFailedinfo(List<FailedCardEntity> failedinfoEntityList);
public List<Map<String,Object>> selectFailedinfo(int state);
public List<FailedCardEntity> findFailedList(String state);
public List<FailedCardEntity> selectAcceptNoAtFailedCard(String accept_No);
public List<SpecialCardEntity> selectAcceptNoAtSpecialCard(String accept_No);
public List<GroupNoEntity> selectAcceptNoAtGroupNo(String groupNo);
}
......@@ -43,12 +43,14 @@ public class CardBodyServiceImpl implements CardBodyService {
// return cardBodyMapper.updateCardBody(map);
// }
@Override
public List<CardBodyEntity> insertCardBody(String cardBodyId) {
List<CardBodyEntity> cardBody = cardBodyMapper.insertCardBody(cardBodyId);
public List<CardBodyEntity> findCardBody(String cardBodyId) {
List<CardBodyEntity> cardBody = cardBodyMapper.findCardBody(cardBodyId);
return cardBody;
}
public int insertCardBody(String cardTypeId,String isActive,String taskId,String totalCount){
int cardBody = cardBodyMapper.insertCardBody(cardTypeId,isActive,taskId,totalCount);
return cardBody;
}
}
package com.yxproject.start.service.impl;
import com.yxproject.start.entity.FailedCardEntity;
import com.yxproject.start.entity.GroupNoEntity;
import com.yxproject.start.entity.SpecialCardEntity;
import com.yxproject.start.mapper.FailedCardMapper;
import com.yxproject.start.service.FailedCardService;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -34,8 +36,27 @@ public class FailedCardServiceImpl implements FailedCardService {
}
@Override
public List<Map<String,Object>> selectFailedinfo(int state) {
List<Map<String, Object>> maps = failedCardMapper.selectFailedCardEntityByState(state);
return maps;
public List<FailedCardEntity> findFailedList(String state) {
List<FailedCardEntity> failedList = failedCardMapper.findFailedList(state);
return failedList;
}
@Override
public List<FailedCardEntity> selectAcceptNoAtFailedCard(String accept_No) {
List<FailedCardEntity> failedCardEntities = failedCardMapper.selectAcceptNoAtFailedCard(accept_No);
return failedCardEntities;
}
@Override
public List<SpecialCardEntity> selectAcceptNoAtSpecialCard(String accept_No) {
List<SpecialCardEntity> specialCardEntities = failedCardMapper.selectAcceptNoAtSpecialCard(accept_No);
return specialCardEntities;
}
@Override
public List<GroupNoEntity> selectAcceptNoAtGroupNo(String groupNo) {
List<GroupNoEntity> groupNoEntities = failedCardMapper.selectAcceptNoAtGroupNo(groupNo);
return groupNoEntities;
}
}
......@@ -6,10 +6,7 @@ import com.yxproject.start.service.ProdCardService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
/**
* Created by Administrator on 2018/12/26.
......@@ -29,6 +26,20 @@ public class ProdCardServiceImpl implements ProdCardService {
List list = new ArrayList<>();
for (int i=0; i <idNo.size(); i++) {
List <ProdCardEntity> prodCardEntity = specialCardMapper.getProdCard((String) idNo.get(i));
if(prodCardEntity.size() == 0){
ProdCardEntity prodCardEntity1 = new ProdCardEntity() ;
prodCardEntity1.setName("信息有误");
if(((String) idNo.get(i)).length() == 10){
prodCardEntity1.setAcceptNo((String) idNo.get(i));
prodCardEntity1.setIdNo(null);
}
else{
prodCardEntity1.setAcceptNo(null);
prodCardEntity1.setIdNo((String) idNo.get(i));
}
list.add(prodCardEntity1);
}
list.addAll(prodCardEntity);
}
// 去重
......
......@@ -10,9 +10,13 @@
<result column="TOTAL_COUNT" property="total_Count" jdbcType="NUMERIC"/>
</resultMap>
<select id="insertCardBodyEntity" resultType="com.yxproject.start.entity.CardBodyEntity" parameterType="String">
<select id="findCardBody" resultType="com.yxproject.start.entity.CardBodyEntity" parameterType="String">
select * from CARD_BODY where CARD_BODY_ID=#{card_Body_Id}
</select>
</select>
<insert id="insertCardBody" parameterType="String" >
INSERT INTO CARD_BODY (CARD_TYPE_ID,IS_ACTIVE,TASK_ID,TOTAL_COUNT) VALUES (#{cardTypeId},#{isActive},#{taskId},#{totalCount})
</insert>
<update id="updateCardBody" parameterType="com.yxproject.start.entity.CardBodyEntity">
update CARD_BODY
......@@ -30,7 +34,7 @@
<select id="findCbCountByDealdateViewData" resultType="java.util.HashMap" parameterType="String">
SELECT * FROM FINDCBCOUNTBYDEALDATE_VIEW WHERE FIND_CBCOUNT_LIST.SET_STARTTIME_PARAM(#{startTime})=#{startTime} AND FIND_CBCOUNT_LIST.SET_ENDTIME_PARAM(#{endTime})=#{endTime}
</select>
</select>
<select id="findCbCountByDealdate" resultType="java.util.HashMap">
WITH
......
......@@ -13,13 +13,13 @@
<result column="STATE" property="state" jdbcType="NUMERIC"/>
</resultMap>
<select id="selectFailedCardEntityByState" resultType="java.util.HashMap" parameterType="java.lang.Integer">
select * from FAILED_CARD where state = #{state}
<select id="findFailedList" resultType="com.yxproject.start.entity.FailedCardEntity" parameterType="String">
select FAILED_CARD_ID as failedCardId, FAILED_CARD_REASON_ID as failedCardReasonId, ACCEPT_NO as acceptNo, TASK_ID as taskId, POSITION_DATE as positionDate, FINISH_DATE as finishDate, ALLOT_DATE as allotDate, PRINT_DATE as printDate, STATE as state from FAILED_CARD where STATE = #{state}
</select>
<insert id="saveFailedCardEntity" parameterType="com.yxproject.start.entity.FailedCardEntity" >
insert into FAILED_CARD (FAILED_CARD_ID,FAILED_CARD_REASON_ID,ACCEPT_NO,TASK_ID,POSITION_DATE,FINISH_DATE,ALLOT_DATE,PRINT_DATE,STATE )
values (#{failed_Card_Id},#{failed_Card_Reason_Id},#{accept_No},#{task_Id},#{position_Date},#{finish_Date},#{allot_Date},#{print_Date},#{state})
insert into FAILED_CARD (failed_Card_Reason_Id,ACCEPT_NO,TASK_ID,STATE )
values (#{failed_Card_Reason_Id},#{accept_No},#{task_Id},#{state})
</insert>
<update id="updateFailedCardEntity" parameterType="com.yxproject.start.entity.FailedCardEntity">
......@@ -36,5 +36,13 @@ update FAILED_CARD
</set>
where failed_Card_Id =#{failed_Card_Id}
</update>
<select id="selectAcceptNoAtFailedCard" resultType="com.yxproject.start.entity.FailedCardEntity" parameterType="String">
select * from failed_card where accept_No =#{accept_No}
</select>
<select id="selectAcceptNoAtSpecialCard" resultType="com.yxproject.start.entity.SpecialCardEntity" parameterType="String">
select * from special_card where accept_No =#{accept_No}
</select>
<select id="selectAcceptNoAtGroupNo" resultType="com.yxproject.start.entity.GroupNoEntity" parameterType="String">
select * from group_no where group_no =#{groupNo}
</select>
</mapper>
\ No newline at end of file
......@@ -5,6 +5,7 @@
<th>NO.</th>
<th>受理号</th>
<th>姓名</th>
<th>身份证号</th>
<th>类型</th>
</thead>
<tbody>
......@@ -12,9 +13,10 @@
<td>{{$index + 1}}</td>
<td>{{item.acceptNo}}</td>
<td>{{item.name}}</td>
<td ng-if="item.specialType==0">余证</td>
<td ng-if="item.specialType==1">快证</td>
<td ng-if="item.specialType==2" style="color: red;">退证</td>
<td>{{item.idNo}}</td>
<td ng-if="item.specialType==1">余证</td>
<td ng-if="item.specialType==2">快证</td>
<td ng-if="item.specialType==3" style="color: red;">退证</td>
</tr>
</tbody>
</table>
......
......@@ -13,9 +13,9 @@
<tbody>
<tr ng-repeat="specialCard in specialCardList">
<td>{{specialCard.accept_No}}</td>
<td ng-if="specialCard.special_Type==0">余证</td>
<td ng-if="specialCard.special_Type==1">快证</td>
<td ng-if="specialCard.special_Type==2">退证</td>
<td ng-if="specialCard.special_Type==1">余证</td>
<td ng-if="specialCard.special_Type==2">快证</td>
<td ng-if="specialCard.special_Type==3">退证</td>
</tr>
</tbody>
</table>
......
......@@ -26,6 +26,8 @@
<script src="vendor/layui/layui.js"></script>
<!-- Angular -->
<script src="vendor/angular/angular.js"></script>
<script src="vendor/My97DatePicker/WdatePicker.js"></script>
<!--<script src="vendor/My97DatePicker/calendar.js"></script>-->
<script src="vendor/angular/angular-animate/angular-animate.js"></script>
<script src="vendor/angular/angular-cookies/angular-cookies.js"></script>
......
......@@ -16,4 +16,6 @@ angular.module('app', [
'ui.validate',
'oc.lazyLoad',
'pascalprecht.translate'
]);
\ No newline at end of file
]);
/* App Module */
var fs = angular.module('fs', ['fs.services', 'fs.controllers', 'fs.directives', 'ui.bootstrap','blueimp.fileupload']);
......@@ -454,6 +454,21 @@ app.service('MessageService', function (ngDialog) {
MessageService.httpRequestFailed(JSON.stringify(errA))
})
},
updateFailedCard:function(failedCardId,state,success){
$http({
method: 'GET',
url: "../user/updateFailedinfo" + urlTimeStamp(),
params:{
failedCardId:failedCardId,
state:state
}
}).then(function successCallback(response) {
success(response.data)
},function(err){
var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
MessageService.httpRequestFailed(JSON.stringify(errA))
})
},
findFailedinfo:function(state,workShop,success){
$http({
method: 'GET',
......@@ -514,10 +529,13 @@ app.service('MessageService', function (ngDialog) {
})
},
saveFailedCardsID:function(success){
saveFailedCardsID:function(idNo,success){
$http({
method: 'GET',
url: "../yingxin/addInValidCardInfo" + urlTimeStamp(),
url: "../user/addFailedinfo" + urlTimeStamp(),
params:{
idNo:idNo
}
}).then(function successCallback(response) {
console.log(response.data,"-------------response.data------")
success(response.data)
......@@ -527,7 +545,7 @@ app.service('MessageService', function (ngDialog) {
})
},
addRemainCard:function(success){
addRemainCard:function(idNo,success){
$http({
method: 'GET',
url: "../yingxin/addRemainCard" + urlTimeStamp(),
......@@ -542,7 +560,22 @@ app.service('MessageService', function (ngDialog) {
MessageService.httpRequestFailed(JSON.stringify(errA))
})
},
getCardBodyReportData:function(startDate,endDate,success){
$http({
method: 'GET',
url: "../yingxin/getCardBodyCount" + urlTimeStamp(),
params:{
startTime:startDate,
endTime:endDate
}
}).then(function successCallback(response) {
console.log(response.data,"-------------getCardBodyReportData.data------")
success(response.data)
},function(err){
var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
MessageService.httpRequestFailed(JSON.stringify(errA))
})
},
getprintReceipt:function(startDate,endDate,success) {
$http({
......
......@@ -86,7 +86,7 @@ app.controller('addFailedCardCtrl', ['$scope', '$rootScope', '$http', '$state',
console.log($scope.dataInfo,"-=====$scope.dataInfo====")
var count = 0;
for(var i=0;i<$scope.dataInfo.size;i++){
if($scope.dataInfo[i].name!=null){
if($scope.dataInfo[i].idNo!=null&&$scope.dataInfo[i].acceptNo!=null){
count+=1;
}else{
continue;
......@@ -96,6 +96,9 @@ app.controller('addFailedCardCtrl', ['$scope', '$rootScope', '$http', '$state',
$scope.confirmFailedInfo = function () {
console.log($rootScope.arr)
$(".confirmBtn").attr("disabled", true);
console.log(count,"--------count");
console.log($scope.dataInfo.length,"--$scope.dataInfo.length--");
console.log($scope.dataInfo,"---$scope.dataInfo----");
if(count==$scope.dataInfo.length){
HttpService.saveFailedCardsID($rootScope.arr,function(data){
$scope.isShowSuccess = 1;
......
......@@ -90,6 +90,8 @@ app.controller('addRemainCardCtrl', ['$scope', '$rootScope', '$http', '$state',
console.log($rootScope.arr)
$(".confirmBtn").attr("disabled", true);
if(count==$scope.dataInfo.length){
console.log($rootScope.arr,"---$rootScope.arr---")
HttpService.addRemainCard($rootScope.arr,function(data){
$scope.isShowSuccess = 1;
$scope.AddSuccess = data.respData.string;
......
......@@ -3,13 +3,6 @@
ng-init="app.settings.asideFixed = true;app.settings.asideDock = false;app.settings.container = false;app.hideAside = false;app.hideFooter = true;">
<div class="hbox hbox-auto-xs hbox-auto-sm">
<div class="col w-md bg-light dk b-r bg-auto">
<div class="wrapper b-b bg">
<button class="btn btn-sm btn-default pull-right visible-sm visible-xs" ui-toggle-class="show"
target="#email-menu"><i class="fa fa-bars"></i></button>
<a class="w-xs font-bold">废证任务单</a>
</div>
</div>
<div class="col">
<div class="wrapper-md">
......@@ -39,7 +32,7 @@
<span style="padding-left:10px;"
ng-show="failedCard.allotDate==null">未分配</span>
<span style="padding-left:10px;"
ng-show="failedCard.allotDate!=null">{{failedCard.allotDate}}}</span></span>
ng-show="failedCard.allotDate!=null">{{failedCard.allotDate}}</span></span>
</td>
<td>{{failedCard.positionDate}}</td>
<td>{{failedCard.state}}</td>
......
......@@ -109,8 +109,8 @@ app.controller('failedCardCtrl', ['$scope', '$rootScope', '$http', '$state', '$f
]
$scope.finishClick = function (taskId, userState) {
HttpService.updateProductionTask(taskId, userState, function (data) {
$scope.finishClick = function (failedCardId,userState) {
HttpService.updateFailedCard(failedCardId, userState, function (data) {
//点击确认成功后 再次废证列表
getFailedCardListData($rootScope.loginData.state, $rootScope.loginData.workshop);
})
......
......@@ -574,7 +574,7 @@
<div class="panel-heading">
<h3 class="panel-title">
循环单
</h3>
</h3>分配时间
</div>
<div class="panel-body" style="width: auto">
<div class="container" style="width: auto">
......
<div class="row" style="font-size: 1.3em;border-bottom:1px solid #CCCCCC;margin-bottom:10px;padding-top:10px;">
<div class="col-md-2">
<div ng-if="loginData.state==1||state=='01'">地市质量报表</div>
<div ng-if="loginData.state==2||state=='02'">生产情况统计日报表</div>
<div ng-if="loginData.username=='ping1'||loginData.username=='ydw1'||state=='014'">平一日报表</div>
<div ng-if="loginData.username=='ping2'||loginData.username=='ydw2'||state=='024'">平二日报表</div>
<div ng-if="loginData.state==6||state=='06'">质检月报表</div>
<div ng-if="loginData.state==7||state=='07'||loginData.state==8">仓库报表</div>
</div>
<div class="col-md-10" style="text-align: right;">
<div style="width: auto" ng-if="loginData.state==0||loginData.state==2||state=='01'||state=='02'">
<!--<div class="col-md-2">-->
<!--<div ng-if="userState==1">地市质量报表</div>-->
<!--<div ng-if="userState==2">生产情况统计日报表</div>-->
<!--<div ng-if="userState=='ping1'">平一日报表</div>-->
<!--<div ng-if="userState==6">质检月报表</div>-->
<!--<div ng-if="userState==7">仓库报表</div>-->
<!--</div>-->
<!--<div class="col-md-10" style="text-align: right;">-->
<div style="width: auto" ng-if="userState==0||userState==2||state=='01'||state=='02'" style="margin-left:100px;">
<span>起始日期:</span>
<input type="text" ng-model="nowDate" id="wdate1" class="Wdate" onClick="WdatePicker({el:this,dateFmt:'yyyyMMdd',autoPickDate:'true'})">
<span>结束日期:</span>
<input type="text" ng-model="month_last" id="wdate2" class="Wdate" onClick="WdatePicker({el:this,dateFmt:'yyyyMMdd',autoPickDate:'true'})">
<input type="submit" ng-if="loginData.state==1||state=='01'" class="btn btn-primary" value="查询" ng-click="myClickLlx()">
<input type="submit" ng-if="loginData.state==2||state=='02'" class="btn btn-primary" value="查询" ng-click="myClick()">
<input type="submit" ng-if="userState==1||state=='01'" class="btn btn-primary" value="查询" ng-click="myClickLlx()">
<input type="submit" ng-if="userState==2||state=='02'" class="btn btn-primary" value="查询" ng-click="myClick()">
<span ng-if="msgAlert" style="color:red;font-size: 17px;">{{msgAlert}}</span>
</div>
<div style="width: auto" ng-if="loginData.state==4||state=='014'||state=='024'">
<span>查询日期:</span>
<input type="text" ng-model="nowDate" id="wdateCj" class="Wdate" onClick="WdatePicker({el:this,dateFmt:'yyyyMMdd',autoPickDate:'true'})">
<input type="submit" class="btn btn-primary" value="查询" ng-click="myCjClick()">
</div>
<div style="width: auto" ng-if="loginData.state==6||state=='06'">
<span>预定位接收月份:</span>
<input type="text" ng-model="nowMonth" id="wdateZj" class="Wdate" onClick="WdatePicker({el:this,dateFmt:'yyyyMM',autoPickDate:'true'})">
<input type="submit" class="btn btn-primary" value="查询" ng-click="myZjClick()">
</div>
<div class="yx-div-header" ng-if="loginData.state==7||state=='07'||loginData.state==8">
<span>查询日期:</span>
<input type="text" id="wdate1" class="Wdate" ng-model="month_first" onClick="WdatePicker({el:this,dateFmt:'yyyyMMdd',autoPickDate:'true'})">
<span>-</span>
<input type="text" id="wdate2" class="Wdate" ng-model="month_last" onClick="WdatePicker({el:this,dateFmt:'yyyyMMdd',autoPickDate:'true'})">
<input type="submit" value="查询" class="btn btn-primary" ng-click="myClick()">
<span ng-if="msgAlert" style="color:red;font-size: 17px;">{{msgAlert}}</span>
</div>
</div>
</div>
<div id="mask-loading" class="mask-loading" ng-if="loading" style="background-color: rgba(0, 0, 0, 0.17);">
<div class="loading">
<span></span>
<span></span>
<span></span>
<span></span>
<span></span>
</div>
<!--</div>-->
</div>
<div style="padding: 10px;background-color: #fff;border: 1px solid #CCC;border-radius: 10px;">
<div ng-if="loginData.state==1||state=='01'">
<div ng-if="dataCheckData.length>0 && dataCheckData[0][1]!='合计'">
<table class="table table-hover" style="margin-top:10px;">
<thead>
<th>地市</th>
<th>合格数</th>
<th>不合格数</th>
<th>不合格率</th>
</thead>
<tbody>
<tr ng-repeat="city in dataCheckData">
<td width="100px">{{city[1]}}</td>
<td width="100px">{{city[2]}}</td>
<td width="100px">{{city[3]}}</td>
<td width="100px" ng-if="city[4]==0">0</td>
<td width="100px" ng-if="city[4]>0">{{city[4] | number:2}} </td>
</tr>
</tbody>
</table>
<div style="text-align: right">
<button class="btn btn-primary" ng-click="printQualityReport()" >
下载报表
</button>
</div>
</div>
<div ng-if="dataCheckData.length==0 || dataCheckData[0][1]=='合计'" style="font-size:1.5em;">
当天暂无报表数据。
</div>
</div>
<div ng-if="loginData.state==2||state=='02'">
<div ng-if="printDataReport.dayInfo.length>0">
<div ng-if="userState==2">
<div ng-if="cardBodyReportData.length>0">
<table class="table table-hover" style="margin-top:10px;">
<thead>
<th></th>
<th>普通证</th>
<!--<th>特证</th>-->
<th>快证</th>
<th>异地KS邮</th>
<th>异地KS普</th>
<th>异地邮</th>
......@@ -91,18 +33,23 @@
<th>KS普</th>
<th>KS邮</th>
<th>邮寄证</th>
<th></th>
<th>军人</th>
<th>小计</th>
</thead>
<tbody>
<tr ng-repeat="city in printDataReport.dayInfo">
<tr ng-repeat="city in cardBodyReportData">
<td width="100px">{{city.cityName}}</td>
<td width="100px" ng-repeat="item in city.info track by $index" ng-if="$index!=1 && $index!=6 && $index!=10 && $index!=11 && $index!=12">
<span ng-if="item!=0">{{item}}</span>
<span ng-if="item==0"></span>
</td>
<td width="100px">{{city.info[12]}}</td>
<td width="100px">{{city.info[11]}}</td>
<td width="100px">{{city.PUTONGZHENG}}</td>
<td width="100px">{{city.KUAIZHENG}}</td>
<td width="100px">{{city.YIDIKSPU}}</td>
<td width="100px">{{city.YIDIKSYOU}}</td>
<td width="100px">{{city.YIDIYOU}}</td>
<td width="100px">{{city.YIDIPU}}</td>
<td width="100px">{{city.KSPU}}</td>
<td width="100px">{{city.KSYOU}}</td>
<td width="100px">{{city.YOUJIZHENG}}</td>
<td width="100px">{{city.JUNRENZHENG}}</td>
<td width="100px">{{city.ACTIVE_COUNT}}</td>
</tr>
</tbody>
</table>
......@@ -113,11 +60,11 @@
</div>
</div>
<div ng-if="printDataReport.dayInfo == null" style="font-size:1.5em;">
<div ng-if=" cardBodyReportData== null" style="font-size:1.5em;">
当天暂无报表数据。
</div>
</div>
<div ng-if="loginData.state==4||state=='014'||state=='024'">
<div ng-if="userState==4">
<div ng-if="pingReportByDay.normalInfo.length>0 &&pingReportByDay.normalInfo[0][11]!='合计'">
<table class="table table-hover" style="margin-top:10px;">
<thead>
......@@ -176,7 +123,7 @@
当天暂无报表数据。
</div>
</div>
<div ng-if="loginData.state==6||state=='06'">
<div ng-if="userState==6||state=='06'">
<div ng-if="qulityCheckData.length>0 && qulityCheckData[0][3]!='合计'">
<table class="table table-hover" style="margin-top:10px;">
<thead>
......@@ -211,7 +158,7 @@
当天暂无报表数据。
</div>
</div>
<div ng-if="loginData.state==7||state=='07'||loginData.state==8">
<div ng-if="userState==7||state=='07'||loginData.state==8">
<div ng-if="StoreReportData.length==0" style="font-size:1.5em;">
当天暂无报表数据。
</div>
......
......@@ -5,8 +5,8 @@ app.controller('yieldReportCtrl', ['$scope', '$rootScope', '$http', '$state', '$
} else {
$state.go("layout.yieldReport")
}
$scope.userState = $rootScope.workshop;
// $scope.userState=5;
// $scope.userState = $rootScope.loginData.workshop;
$scope.userState=2;
$scope.date = "date";
......@@ -80,25 +80,17 @@ app.controller('yieldReportCtrl', ['$scope', '$rootScope', '$http', '$state', '$
})
}
var getPrintDataReport = function (startDate, endDate) {
if ($rootScope.loginData.state == 2) {
HttpService.getPrintData(startDate, endDate, function (data) {
$scope.printDataReport = data.respData;
console.log("初始化打印卸载报表:", $scope.printDataReport)
})
}
if ($rootScope.loginData.state == 0) {
HttpService.getAdminPrintData(startDate, endDate, $scope.userState, function (data) {
$scope.printDataReport = data.respData;
console.log("初始化打印卸载报表:", $scope.printDataReport)
var getCardBodyReport = function (startDate, endDate) {
HttpService.getCardBodyReportData(startDate, endDate, function (data) {
console.log(data,'--------测试打印卡基报表-------')
$scope.cardBodyReportData = data.respData;
console.log("打印卡基报表:", $scope.cardBodyReportData)
})
}
}
if ($rootScope.loginData.state == 2 || $rootScope.loginData.state == 0) {
console.log($scope.currentDetailDate, $scope.month_last)
getPrintDataReport($scope.currentDetailDate, $scope.month_last)
getCardBodyReport($scope.currentDetailDate, $scope.month_last)
}
// 打印 打印卸载报表按钮
$scope.printPrintDataReport = function () {
......@@ -179,10 +171,10 @@ app.controller('yieldReportCtrl', ['$scope', '$rootScope', '$http', '$state', '$
})
}
if ($rootScope.loginData.state == 0) {
HttpService.getAdminPingReportByDayData(date, 'p' + $scope.state.substring(1, 2), function (data) {
$scope.pingReportByDay = data.respData;
console.log("车间日报表:", $scope.pingReportByDay)
})
// HttpService.getAdminPingReportByDayData(date, 'p' + $scope.state.substring(1, 2), function (data) {
// $scope.pingReportByDay = data.respData;
// console.log("车间日报表:", $scope.pingReportByDay)
// })
}
}
......@@ -253,21 +245,21 @@ app.controller('yieldReportCtrl', ['$scope', '$rootScope', '$http', '$state', '$
}
var getStorehouseReportDatas = function (start, end) {
HttpService.getStorehouseReportDatas(start, end, function (data) {
$scope.totalCount = data.respData.sumInfo;
$scope.StoreReportData = data.respData.listInfo;
for (var i = 0; i < $scope.StoreReportData.length; i++) {
if (i == 0) {
$scope.StoreReportData[i].isActive = true;
} else {
$scope.StoreReportData[i].isActive = false;
}
}
console.log("初始化仓库出入库报表:", data.respData)
})
// HttpService.getStorehouseReportDatas(start, end, function (data) {
// $scope.totalCount = data.respData.sumInfo;
// $scope.StoreReportData = data.respData.listInfo;
// for (var i = 0; i < $scope.StoreReportData.length; i++) {
// if (i == 0) {
// $scope.StoreReportData[i].isActive = true;
// } else {
// $scope.StoreReportData[i].isActive = false;
// }
// }
// console.log("初始化仓库出入库报表:", data.respData)
// })
}
if ($rootScope.loginData.state == 7 || $rootScope.loginData.state == 0 || $rootScope.loginData.state == 8) {
getStorehouseReportDatas($scope.month_first, $scope.month_last)
// getStorehouseReportDatas($scope.month_first, $scope.month_last)
}
......@@ -290,12 +282,7 @@ app.controller('yieldReportCtrl', ['$scope', '$rootScope', '$http', '$state', '$
var end = $("#wdate2").val()
if (parseInt(start) <= parseInt(end)) {
$scope.msgAlert = '';
if ($rootScope.loginData.state == 2 || $scope.state == '02') {
getPrintDataReport(start, end);
}
if ($rootScope.loginData.state == 7 || $scope.state == '07' || $rootScope.loginData.state == 8) {
getStorehouseReportDatas(start, end)
}
getCardBodyReport(start, end);
} else {
$scope.msgAlert = "起始日期不能大于结束日期,请重新选择!";
}
......
This diff is collapsed.
This diff is collapsed.
var $lang={
errAlertMsg: "Invalid date or the date out of range,redo or not?",
aWeekStr: ["wk", "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"],
aLongWeekStr:["wk","Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday","Sunday"],
aMonStr: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"],
aLongMonStr: ["January","February","March","April","May","June","July","August","September","October","November","December"],
clearStr: "Clear",
todayStr: "Today",
okStr: "OK",
updateStr: "OK",
timeStr: "Time",
quickStr: "Quick Selection",
err_1: 'MinDate Cannot be bigger than MaxDate!'
}
\ No newline at end of file
var $lang={
errAlertMsg: "\u4E0D\u5408\u6CD5\u7684\u65E5\u671F\u683C\u5F0F\u6216\u8005\u65E5\u671F\u8D85\u51FA\u9650\u5B9A\u8303\u56F4,\u9700\u8981\u64A4\u9500\u5417?",
aWeekStr: ["\u5468","\u65E5","\u4E00","\u4E8C","\u4E09","\u56DB","\u4E94","\u516D"],
aLongWeekStr:["\u5468","\u661F\u671F\u65E5","\u661F\u671F\u4E00","\u661F\u671F\u4E8C","\u661F\u671F\u4E09","\u661F\u671F\u56DB","\u661F\u671F\u4E94","\u661F\u671F\u516D"],
aMonStr: ["\u4E00\u6708","\u4E8C\u6708","\u4E09\u6708","\u56DB\u6708","\u4E94\u6708","\u516D\u6708","\u4E03\u6708","\u516B\u6708","\u4E5D\u6708","\u5341\u6708","\u5341\u4E00","\u5341\u4E8C"],
aLongMonStr: ["\u4E00\u6708","\u4E8C\u6708","\u4E09\u6708","\u56DB\u6708","\u4E94\u6708","\u516D\u6708","\u4E03\u6708","\u516B\u6708","\u4E5D\u6708","\u5341\u6708","\u5341\u4E00\u6708","\u5341\u4E8C\u6708"],
clearStr: "\u6E05\u7A7A",
todayStr: "\u4ECA\u5929",
okStr: "\u786E\u5B9A",
updateStr: "\u786E\u5B9A",
timeStr: "\u65F6\u95F4",
quickStr: "\u5FEB\u901F\u9009\u62E9",
err_1: '\u6700\u5C0F\u65E5\u671F\u4E0D\u80FD\u5927\u4E8E\u6700\u5927\u65E5\u671F!'
}
\ No newline at end of file
var $lang={
errAlertMsg: "\u4E0D\u5408\u6CD5\u7684\u65E5\u671F\u683C\u5F0F\u6216\u8005\u65E5\u671F\u8D85\u51FA\u9650\u5B9A\u7BC4\u570D,\u9700\u8981\u64A4\u92B7\u55CE?",
aWeekStr: ["\u5468","\u65E5","\u4E00","\u4E8C","\u4E09","\u56DB","\u4E94","\u516D"],
aLongWeekStr:["\u5468","\u661F\u671F\u65E5","\u661F\u671F\u4E00","\u661F\u671F\u4E8C","\u661F\u671F\u4E09","\u661F\u671F\u56DB","\u661F\u671F\u4E94","\u661F\u671F\u516D"],
aMonStr: ["\u4E00\u6708","\u4E8C\u6708","\u4E09\u6708","\u56DB\u6708","\u4E94\u6708","\u516D\u6708","\u4E03\u6708","\u516B\u6708","\u4E5D\u6708","\u5341\u6708","\u5341\u4E00","\u5341\u4E8C"],
aLongMonStr: ["\u4E00\u6708","\u4E8C\u6708","\u4E09\u6708","\u56DB\u6708","\u4E94\u6708","\u516D\u6708","\u4E03\u6708","\u516B\u6708","\u4E5D\u6708","\u5341\u6708","\u5341\u4E00\u6708","\u5341\u4E8C\u6708"],
clearStr: "\u6E05\u7A7A",
todayStr: "\u4ECA\u5929",
okStr: "\u78BA\u5B9A",
updateStr: "\u78BA\u5B9A",
timeStr: "\u6642\u9593",
quickStr: "\u5FEB\u901F\u9078\u64C7",
err_1: '\u6700\u5C0F\u65E5\u671F\u4E0D\u80FD\u5927\u65BC\u6700\u5927\u65E5\u671F!'
}
\ No newline at end of file
.Wdate{
border:#999 1px solid;
height:30px;
border-radius: 4px;
background:#fff url(datePicker.gif) no-repeat right;
}
.Wdate::-ms-clear{display:none;}
.WdateFmtErr{
font-weight:bold;
color:red;
}
\ No newline at end of file
/*
* My97 DatePicker 4.8
*/
.WdateDiv{
width:180px;
background-color:#FFFFFF;
border:#bbb 1px solid;
padding:2px;
}
.WdateDiv2{
width:360px;
}
.WdateDiv *{font-size:9pt;}
.WdateDiv .NavImg a{
display:block;
cursor:pointer;
height:16px;
width:16px;
}
.WdateDiv .NavImgll a{
float:left;
background:transparent url(img.gif) no-repeat scroll 0 0;
}
.WdateDiv .NavImgl a{
float:left;
background:transparent url(img.gif) no-repeat scroll -16px 0;
}
.WdateDiv .NavImgr a{
float:right;
background:transparent url(img.gif) no-repeat scroll -32px 0;
}
.WdateDiv .NavImgrr a{
float:right;
background:transparent url(img.gif) no-repeat scroll -48px 0;
}
.WdateDiv #dpTitle{
height:24px;
margin-bottom:2px;
padding:1px;
}
.WdateDiv .yminput{
margin-top:2px;
text-align:center;
height:20px;
border:0px;
width:50px;
cursor:pointer;
}
.WdateDiv .yminputfocus{
margin-top:2px;
text-align:center;
font-weight:bold;
height:20px;
color:blue;
border:#ccc 1px solid;
width:50px;
}
.WdateDiv .menuSel{
z-index:1;
position:absolute;
background-color:#FFFFFF;
border:#ccc 1px solid;
display:none;
}
.WdateDiv .menu{
cursor:pointer;
background-color:#fff;
}
.WdateDiv .menuOn{
cursor:pointer;
background-color:#BEEBEE;
}
.WdateDiv .invalidMenu{
color:#aaa;
}
.WdateDiv .YMenu{
margin-top:20px;
}
.WdateDiv .MMenu{
margin-top:20px;
*width:62px;
}
.WdateDiv .hhMenu{
margin-top:-90px;
margin-left:26px;
}
.WdateDiv .mmMenu{
margin-top:-46px;
margin-left:26px;
}
.WdateDiv .ssMenu{
margin-top:-24px;
margin-left:26px;
}
.WdateDiv .Wweek {
text-align:center;
background:#DAF3F5;
border-right:#BDEBEE 1px solid;
}
.WdateDiv .MTitle{
background-color:#BDEBEE;
}
.WdateDiv .WdayTable2{
border-collapse:collapse;
border:#c5d9e8 1px solid;
}
.WdateDiv .WdayTable2 table{
border:0;
}
.WdateDiv .WdayTable{
line-height:20px;
border:#c5d9e8 1px solid;
}
.WdateDiv .WdayTable td{
text-align:center;
}
.WdateDiv .Wday{
cursor:pointer;
}
.WdateDiv .WdayOn{
cursor:pointer;
background-color:#C0EBEF;
}
.WdateDiv .Wwday{
cursor:pointer;
color:#FF2F2F;
}
.WdateDiv .WwdayOn{
cursor:pointer;
color:#000;
background-color:#C0EBEF;
}
.WdateDiv .Wtoday{
cursor:pointer;
color:blue;
}
.WdateDiv .Wselday{
background-color:#A9E4E9;
}
.WdateDiv .WspecialDay{
background-color:#66F4DF;
}
.WdateDiv .WotherDay{
cursor:pointer;
color:#6A6AFF;
}
.WdateDiv .WotherDayOn{
cursor:pointer;
background-color:#C0EBEF;
}
.WdateDiv .WinvalidDay{
color:#aaa;
}
.WdateDiv #dpTime{
float:left;
margin-top:3px;
margin-right:30px;
}
.WdateDiv #dpTime #dpTimeStr{
margin-left:1px;
}
.WdateDiv #dpTime input{
width:18px;
height:20px;
text-align:center;
border:#ccc 1px solid;
}
.WdateDiv #dpTime .tB{
border-right:0px;
}
.WdateDiv #dpTime .tE{
border-left:0;
border-right:0;
}
.WdateDiv #dpTime .tm{
width:7px;
border-left:0;
border-right:0;
}
.WdateDiv #dpTime #dpTimeUp{
height:10px;
width:13px;
border:0px;
background:url(img.gif) no-repeat -32px -16px;
}
.WdateDiv #dpTime #dpTimeDown{
height:10px;
width:13px;
border:0px;
background:url(img.gif) no-repeat -48px -16px;
}
.WdateDiv #dpQS {
float:left;
margin-right:3px;
margin-top:3px;
background:url(img.gif) no-repeat 0px -16px;
width:20px;
height:20px;
cursor:pointer;
}
.WdateDiv #dpControl {
text-align:right;
}
.WdateDiv .dpButton{
height:20px;
width:45px;
border:#ccc 1px solid;
margin-top:2px;
margin-right:1px;
}
\ No newline at end of file
/*
* My97 DatePicker 4.8 Skin:whyGreen
*/
.WdateDiv{
width:180px;
background-color:#fff;
border:#C5E1E4 1px solid;
padding:2px;
}
.WdateDiv2{
width:360px;
}
.WdateDiv *{font-size:9pt;}
.WdateDiv .NavImg a{
cursor:pointer;
display:block;
width:16px;
height:16px;
margin-top:1px;
}
.WdateDiv .NavImgll a{
float:left;
background:url(img.gif) no-repeat;
}
.WdateDiv .NavImgl a{
float:left;
background:url(img.gif) no-repeat -16px 0px;
}
.WdateDiv .NavImgr a{
float:right;
background:url(img.gif) no-repeat -32px 0px;
}
.WdateDiv .NavImgrr a{
float:right;
background:url(img.gif) no-repeat -48px 0px;
}
.WdateDiv #dpTitle{
height:24px;
padding:1px;
border:#c5d9e8 1px solid;
background:url(bg.jpg);
margin-bottom:2px;
}
.WdateDiv .yminput{
margin-top:2px;
text-align:center;
border:0px;
height:20px;
width:50px;
color:#034c50;
background-color:transparent;
cursor:pointer;
}
.WdateDiv .yminputfocus{
margin-top:2px;
text-align:center;
border:#939393 1px solid;
font-weight:bold;
color:#034c50;
height:20px;
width:50px;
}
.WdateDiv .menuSel{
z-index:1;
position:absolute;
background-color:#FFFFFF;
border:#A3C6C8 1px solid;
display:none;
}
.WdateDiv .menu{
cursor:pointer;
background-color:#fff;
color:#11777C;
}
.WdateDiv .menuOn{
cursor:pointer;
background-color:#BEEBEE;
}
.WdateDiv .invalidMenu{
color:#aaa;
}
.WdateDiv .YMenu{
margin-top:20px;
}
.WdateDiv .MMenu{
margin-top:20px;
*width:62px;
}
.WdateDiv .hhMenu{
margin-top:-90px;
margin-left:26px;
}
.WdateDiv .mmMenu{
margin-top:-46px;
margin-left:26px;
}
.WdateDiv .ssMenu{
margin-top:-24px;
margin-left:26px;
}
.WdateDiv .Wweek {
text-align:center;
background:#DAF3F5;
border-right:#BDEBEE 1px solid;
}
.WdateDiv .MTitle{
color:#13777e;
background-color:#bdebee;
}
.WdateDiv .WdayTable2{
border-collapse:collapse;
border:#BEE9F0 1px solid;
}
.WdateDiv .WdayTable2 table{
border:0;
}
.WdateDiv .WdayTable{
line-height:20px;
color:#13777e;
background-color:#edfbfb;
border:#BEE9F0 1px solid;
}
.WdateDiv .WdayTable td{
text-align:center;
}
.WdateDiv .Wday{
cursor:pointer;
}
.WdateDiv .WdayOn{
cursor:pointer;
background-color:#74d2d9 ;
}
.WdateDiv .Wwday{
cursor:pointer;
color:#ab1e1e;
}
.WdateDiv .WwdayOn{
cursor:pointer;
background-color:#74d2d9;
}
.WdateDiv .Wtoday{
cursor:pointer;
color:blue;
}
.WdateDiv .Wselday{
background-color:#A7E2E7;
}
.WdateDiv .WspecialDay{
background-color:#66F4DF;
}
.WdateDiv .WotherDay{
cursor:pointer;
color:#0099CC;
}
.WdateDiv .WotherDayOn{
cursor:pointer;
background-color:#C0EBEF;
}
.WdateDiv .WinvalidDay{
color:#aaa;
}
.WdateDiv #dpTime{
float:left;
margin-top:3px;
margin-right:30px;
}
.WdateDiv #dpTime #dpTimeStr{
margin-left:1px;
color:#497F7F;
}
.WdateDiv #dpTime input{
height:20px;
width:18px;
text-align:center;
color:#333;
border:#61CAD0 1px solid;
}
.WdateDiv #dpTime .tB{
border-right:0px;
}
.WdateDiv #dpTime .tE{
border-left:0;
border-right:0;
}
.WdateDiv #dpTime .tm{
width:7px;
border-left:0;
border-right:0;
}
.WdateDiv #dpTime #dpTimeUp{
height:10px;
width:13px;
border:0px;
background:url(img.gif) no-repeat -32px -16px;
}
.WdateDiv #dpTime #dpTimeDown{
height:10px;
width:13px;
border:0px;
background:url(img.gif) no-repeat -48px -16px;
}
.WdateDiv #dpQS {
float:left;
margin-right:3px;
margin-top:3px;
background:url(img.gif) no-repeat 0px -16px;
width:20px;
height:20px;
cursor:pointer;
}
.WdateDiv #dpControl {
text-align:right;
margin-top:3px;
}
.WdateDiv .dpButton{
height:20px;
width:45px;
margin-top:2px;
border:#38B1B9 1px solid;
background-color:#CFEBEE;
color:#08575B;
}
\ No newline at end of file
var $lang={
errAlertMsg: "Invalid date or the date out of range,redo or not?",
aWeekStr: ["wk", "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"],
aLongWeekStr:["wk","Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday","Sunday"],
aMonStr: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"],
aLongMonStr: ["January","February","March","April","May","June","July","August","September","October","November","December"],
clearStr: "Clear",
todayStr: "Today",
okStr: "OK",
updateStr: "OK",
timeStr: "Time",
quickStr: "Quick Selection",
err_1: 'MinDate Cannot be bigger than MaxDate!'
}
\ No newline at end of file
var $lang={
errAlertMsg: "不合法的日期格式或者日期超出限定范围,需要撤销吗?",
aWeekStr: ["周","日","一","二","三","四","五","六"],
aLongWeekStr:["周","星期日","星期一","星期二","星期三","星期四","星期五","星期六"],
aMonStr: ["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一","十二"],
aLongMonStr: ["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],
clearStr: "清空",
todayStr: "今天",
okStr: "确定",
updateStr: "确定",
timeStr: "时间",
quickStr: "快速选择",
err_1: '最小日期不能大于最大日期!'
}
\ No newline at end of file
var $lang={
errAlertMsg: "不合法的日期格式或者日期超出限定範圍,需要撤銷嗎?",
aWeekStr: ["周","日","一","二","三","四","五","六"],
aLongWeekStr:["周","星期日","星期一","星期二","星期三","星期四","星期五","星期六"],
aMonStr: ["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一","十二"],
aLongMonStr: ["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],
clearStr: "清空",
todayStr: "今天",
okStr: "確定",
updateStr: "確定",
timeStr: "時間",
quickStr: "快速選擇",
err_1: '最小日期不能大於最大日期!'
}
\ No newline at end of file
��ʽ����ʱ,�ɽ����ļ���ɾȥ
.Wdate{
border:#999 1px solid;
height:20px;
background:#fff url(datePicker.gif) no-repeat right;
}
.cityName{
border:#999 1px solid;
height:20px;
}
.cityName::-ms-clear{display:none;}
.Wdate::-ms-clear{display:none;}
.WdateFmtErr{
font-weight:bold;
color:red;
}
\ No newline at end of file
/*
* My97 DatePicker 4.8
* 皮肤名称:default
*/
/* 日期选择容器 DIV */
.WdateDiv{
width:180px;
background-color:#FFFFFF;
border:#bbb 1px solid;
padding:2px;
}
/* 双月日历的宽度 */
.WdateDiv2{
width:360px;
}
.WdateDiv *{font-size:9pt;}
/****************************
* 导航图标 全部是A标签
***************************/
.WdateDiv .NavImg a{
display:block;
cursor:pointer;
height:16px;
width:16px;
}
.WdateDiv .NavImgll a{
float:left;
background:transparent url(img.gif) no-repeat scroll 0 0;
}
.WdateDiv .NavImgl a{
float:left;
background:transparent url(img.gif) no-repeat scroll -16px 0;
}
.WdateDiv .NavImgr a{
float:right;
background:transparent url(img.gif) no-repeat scroll -32px 0;
}
.WdateDiv .NavImgrr a{
float:right;
background:transparent url(img.gif) no-repeat scroll -48px 0;
}
/****************************
* 年份月份相关
***************************/
/* 年份月份栏 DIV */
.WdateDiv #dpTitle{
height:24px;
margin-bottom:2px;
padding:1px;
}
/* 年份月份输入框 INPUT */
.WdateDiv .yminput{
margin-top:2px;
text-align:center;
height:20px;
border:0px;
width:50px;
cursor:pointer;
}
/* 年份月份输入框获得焦点时的样式 INPUT */
.WdateDiv .yminputfocus{
margin-top:2px;
text-align:center;
font-weight:bold;
height:20px;
color:blue;
border:#ccc 1px solid;
width:50px;
}
/* 菜单选择框 DIV */
.WdateDiv .menuSel{
z-index:1;
position:absolute;
background-color:#FFFFFF;
border:#ccc 1px solid;
display:none;
}
/* 菜单的样式 TD */
.WdateDiv .menu{
cursor:pointer;
background-color:#fff;
}
/* 菜单的mouseover样式 TD */
.WdateDiv .menuOn{
cursor:pointer;
background-color:#BEEBEE;
}
/* 菜单无效时的样式 TD */
.WdateDiv .invalidMenu{
color:#aaa;
}
/* 年选择框的偏移 DIV */
.WdateDiv .YMenu{
margin-top:20px;
}
/* 月选择框的偏移 DIV */
.WdateDiv .MMenu{
margin-top:20px;
*width:62px;
}
/* 时选择框的位置 DIV */
.WdateDiv .hhMenu{
margin-top:-90px;
margin-left:26px;
}
/* 分选择框的位置 DIV */
.WdateDiv .mmMenu{
margin-top:-46px;
margin-left:26px;
}
/* 秒选择框的位置 DIV */
.WdateDiv .ssMenu{
margin-top:-24px;
margin-left:26px;
}
/****************************
* 周相关
***************************/
.WdateDiv .Wweek {
text-align:center;
background:#DAF3F5;
border-right:#BDEBEE 1px solid;
}
/****************************
* 星期,日期相关
***************************/
/* 星期栏 TR */
.WdateDiv .MTitle{
background-color:#BDEBEE;
}
.WdateDiv .WdayTable2{
border-collapse:collapse;
border:#c5d9e8 1px solid;
}
.WdateDiv .WdayTable2 table{
border:0;
}
/* 日期栏表格 TABLE */
.WdateDiv .WdayTable{
line-height:20px;
border:#c5d9e8 1px solid;
}
.WdateDiv .WdayTable td{
text-align:center;
}
/* 日期格的样式 TD */
.WdateDiv .Wday{
cursor:pointer;
}
/* 日期格的mouseover样式 TD */
.WdateDiv .WdayOn{
cursor:pointer;
background-color:#C0EBEF;
}
/* 周末日期格的样式 TD */
.WdateDiv .Wwday{
cursor:pointer;
color:#FF2F2F;
}
/* 周末日期格的mouseover样式 TD */
.WdateDiv .WwdayOn{
cursor:pointer;
color:#000;
background-color:#C0EBEF;
}
.WdateDiv .Wtoday{
cursor:pointer;
color:blue;
}
.WdateDiv .Wselday{
background-color:#A9E4E9;
}
.WdateDiv .WspecialDay{
background-color:#66F4DF;
}
/* 其他月份的日期 */
.WdateDiv .WotherDay{
cursor:pointer;
color:#6A6AFF;
}
/* 其他月份的日期mouseover样式 */
.WdateDiv .WotherDayOn{
cursor:pointer;
background-color:#C0EBEF;
}
/* 无效日期的样式,即在日期范围以外日期格的样式,不能选择的日期 */
.WdateDiv .WinvalidDay{
color:#aaa;
}
/****************************
* 时间相关
***************************/
/* 时间栏 DIV */
.WdateDiv #dpTime{
float:left;
margin-top:3px;
margin-right:30px;
}
/* 时间文字 SPAN */
.WdateDiv #dpTime #dpTimeStr{
margin-left:1px;
}
/* 时间输入框 INPUT */
.WdateDiv #dpTime input{
width:18px;
height:20px;
text-align:center;
border:#ccc 1px solid;
}
/* 时间 时 INPUT */
.WdateDiv #dpTime .tB{
border-right:0px;
}
/* 时间 分和间隔符 ':' INPUT */
.WdateDiv #dpTime .tE{
border-left:0;
border-right:0;
}
/* 时间 秒 INPUT */
.WdateDiv #dpTime .tm{
width:7px;
border-left:0;
border-right:0;
}
/* 时间右边的向上按钮 BUTTON */
.WdateDiv #dpTime #dpTimeUp{
height:10px;
width:13px;
border:0px;
background:url(img.gif) no-repeat -32px -16px;
}
/* 时间右边的向下按钮 BUTTON */
.WdateDiv #dpTime #dpTimeDown{
height:10px;
width:13px;
border:0px;
background:url(img.gif) no-repeat -48px -16px;
}
/****************************
* 其他
***************************/
.WdateDiv #dpQS {
float:left;
margin-right:3px;
margin-top:3px;
background:url(img.gif) no-repeat 0px -16px;
width:20px;
height:20px;
cursor:pointer;
}
.WdateDiv #dpControl {
text-align:right;
}
.WdateDiv .dpButton{
height:20px;
width:45px;
border:#ccc 1px solid;
margin-top:2px;
margin-right:1px;
}
\ No newline at end of file
/*
* My97 DatePicker 4.8
* 皮肤名称:whyGreen
*/
/* 日期选择容器 DIV */
.WdateDiv{
width:180px;
background-color:#fff;
border:#C5E1E4 1px solid;
padding:2px;
}
/* 双月日历的宽度 */
.WdateDiv2{
width:360px;
}
.WdateDiv *{font-size:9pt;}
/****************************
* 导航图标 全部是A标签
***************************/
.WdateDiv .NavImg a{
cursor:pointer;
display:block;
width:16px;
height:16px;
margin-top:1px;
}
.WdateDiv .NavImgll a{
float:left;
background:url(img.gif) no-repeat;
}
.WdateDiv .NavImgl a{
float:left;
background:url(img.gif) no-repeat -16px 0px;
}
.WdateDiv .NavImgr a{
float:right;
background:url(img.gif) no-repeat -32px 0px;
}
.WdateDiv .NavImgrr a{
float:right;
background:url(img.gif) no-repeat -48px 0px;
}
/****************************
* 年份月份相关
***************************/
/* 年份月份栏 DIV */
.WdateDiv #dpTitle{
height:24px;
padding:1px;
border:#c5d9e8 1px solid;
background:url(bg.jpg);
margin-bottom:2px;
}
/* 年份月份输入框 INPUT */
.WdateDiv .yminput{
margin-top:2px;
text-align:center;
border:0px;
height:20px;
width:50px;
color:#034c50;
background-color:transparent;
cursor:pointer;
}
/* 年份月份输入框获得焦点时的样式 INPUT */
.WdateDiv .yminputfocus{
margin-top:2px;
text-align:center;
border:#939393 1px solid;
font-weight:bold;
color:#034c50;
height:20px;
width:50px;
}
/* 菜单选择框 DIV */
.WdateDiv .menuSel{
z-index:1;
position:absolute;
background-color:#FFFFFF;
border:#A3C6C8 1px solid;
display:none;
}
/* 菜单的样式 TD */
.WdateDiv .menu{
cursor:pointer;
background-color:#fff;
color:#11777C;
}
/* 菜单的mouseover样式 TD */
.WdateDiv .menuOn{
cursor:pointer;
background-color:#BEEBEE;
}
/* 菜单无效时的样式 TD */
.WdateDiv .invalidMenu{
color:#aaa;
}
/* 年选择框的偏移 DIV */
.WdateDiv .YMenu{
margin-top:20px;
}
/* 月选择框的偏移 DIV */
.WdateDiv .MMenu{
margin-top:20px;
*width:62px;
}
/* 时选择框的位置 DIV */
.WdateDiv .hhMenu{
margin-top:-90px;
margin-left:26px;
}
/* 分选择框的位置 DIV */
.WdateDiv .mmMenu{
margin-top:-46px;
margin-left:26px;
}
/* 秒选择框的位置 DIV */
.WdateDiv .ssMenu{
margin-top:-24px;
margin-left:26px;
}
/****************************
* 周相关
***************************/
.WdateDiv .Wweek {
text-align:center;
background:#DAF3F5;
border-right:#BDEBEE 1px solid;
}
/****************************
* 星期,日期相关
***************************/
/* 星期栏 TR */
.WdateDiv .MTitle{
color:#13777e;
background-color:#bdebee;
}
.WdateDiv .WdayTable2{
border-collapse:collapse;
border:#BEE9F0 1px solid;
}
.WdateDiv .WdayTable2 table{
border:0;
}
/* 日期栏表格 TABLE */
.WdateDiv .WdayTable{
line-height:20px;
color:#13777e;
background-color:#edfbfb;
border:#BEE9F0 1px solid;
}
.WdateDiv .WdayTable td{
text-align:center;
}
/* 日期格的样式 TD */
.WdateDiv .Wday{
cursor:pointer;
}
/* 日期格的mouseover样式 TD */
.WdateDiv .WdayOn{
cursor:pointer;
background-color:#74d2d9 ;
}
/* 周末日期格的样式 TD */
.WdateDiv .Wwday{
cursor:pointer;
color:#ab1e1e;
}
/* 周末日期格的mouseover样式 TD */
.WdateDiv .WwdayOn{
cursor:pointer;
background-color:#74d2d9;
}
.WdateDiv .Wtoday{
cursor:pointer;
color:blue;
}
.WdateDiv .Wselday{
background-color:#A7E2E7;
}
.WdateDiv .WspecialDay{
background-color:#66F4DF;
}
/* 其他月份的日期 */
.WdateDiv .WotherDay{
cursor:pointer;
color:#0099CC;
}
/* 其他月份的日期mouseover样式 */
.WdateDiv .WotherDayOn{
cursor:pointer;
background-color:#C0EBEF;
}
/* 无效日期的样式,即在日期范围以外日期格的样式,不能选择的日期 */
.WdateDiv .WinvalidDay{
color:#aaa;
}
/****************************
* 时间相关
***************************/
/* 时间栏 DIV */
.WdateDiv #dpTime{
float:left;
margin-top:3px;
margin-right:30px;
}
/* 时间文字 SPAN */
.WdateDiv #dpTime #dpTimeStr{
margin-left:1px;
color:#497F7F;
}
/* 时间输入框 INPUT */
.WdateDiv #dpTime input{
height:20px;
width:18px;
text-align:center;
color:#333;
border:#61CAD0 1px solid;
}
/* 时间 时 INPUT */
.WdateDiv #dpTime .tB{
border-right:0px;
}
/* 时间 分和间隔符 ':' INPUT */
.WdateDiv #dpTime .tE{
border-left:0;
border-right:0;
}
/* 时间 秒 INPUT */
.WdateDiv #dpTime .tm{
width:7px;
border-left:0;
border-right:0;
}
/* 时间右边的向上按钮 BUTTON */
.WdateDiv #dpTime #dpTimeUp{
height:10px;
width:13px;
border:0px;
background:url(img.gif) no-repeat -32px -16px;
}
/* 时间右边的向下按钮 BUTTON */
.WdateDiv #dpTime #dpTimeDown{
height:10px;
width:13px;
border:0px;
background:url(img.gif) no-repeat -48px -16px;
}
/****************************
* 其他
***************************/
.WdateDiv #dpQS {
float:left;
margin-right:3px;
margin-top:3px;
background:url(img.gif) no-repeat 0px -16px;
width:20px;
height:20px;
cursor:pointer;
}
.WdateDiv #dpControl {
text-align:right;
margin-top:3px;
}
.WdateDiv .dpButton{
height:20px;
width:45px;
margin-top:2px;
border:#38B1B9 1px solid;
background-color:#CFEBEE;
color:#08575B;
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment