Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit 42b1cf44 authored by dahai's avatar dahai
Browse files
Options

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

# Conflicts:
#	src/main/resources/static/views/filmManagement/filmManagement.html
parents 3c1c71da 0710ea76
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 57 deletions
src/main/resources/static/views/insertCardBody/insertCardBody.html
View file @ 42b1cf44
......@@ -122,14 +122,14 @@
<tbody>
<tr ng-repeat="item in cardBodyManagement.cardBody">
<td>{{item.cardBodyId}}</td>
<td>{{item.saveDate}}</td>
<td>{{item.saveDate | date:'yyyy-MM-dd HH:mm:ss'}}</td>
<td>{{item.totalCount}}</td>
<td ng-if="item.cardType==1">出库</td>
<td ng-if="item.cardType==2">入库</td>
<td>{{item.note}}</td>
<td>{{item.name}}</td>
<td ng-if="item.state==0" class="text-danger">未审核</td>
<td ng-if="item.state==1" class="text-success">已审核</td>
<td ng-if="item.state==1" class="text-success">审核通过</td>
</tr>
<tr class="bg-info">
......
src/main/resources/static/views/materialManagement/materialManagement.html
View file @ 42b1cf44
......@@ -112,7 +112,9 @@
<td ng-if="item.cardType==2">入库</td>
<td>{{item.note}}</td>
<td>{{item.name}}</td>
<td ng-if="item.state==0"><a ng-click="updateApplyState(item)">确认审核</a></td>
<td ng-if="item.state==0">
<button class="btn btn-info" ng-click="updateApplyState(item)">确认审核</button>
</td>
<td ng-if="item.state==1">已审核</td>
</tr>
</tbody>
......
src/main/resources/static/views/materialManagement/materialManagement.js
View file @ 42b1cf44
......@@ -23,6 +23,7 @@ angular.module('AvatarCheck.materialManagement', ['ngRoute', 'AvatarCheck.http']
$scope.insertCardBody = function () {
var totalCount = $scope.totalCount;
var note = $scope.note;
var cardType = $scope.cardType;
......@@ -32,6 +33,7 @@ angular.module('AvatarCheck.materialManagement', ['ngRoute', 'AvatarCheck.http']
cardType="1";
}
console.log(totalCount,note,cardType,cardBodyType,name);
if (totalCount>0){
HttpService.insertCardBody(cardType,totalCount,note,cardBodyType,name,1,function (data) {
$scope.totalCount="";
$scope.note=""
......@@ -41,6 +43,10 @@ angular.module('AvatarCheck.materialManagement', ['ngRoute', 'AvatarCheck.http']
MessageService.showAlert("添加成功")
}
})
}else {
MessageService.showAlert("请输入正确的卡体耗材数量")
}
}
$scope.selectMaterialManagement=function(){
......
src/main/resources/static/views/task/task.js
View file @ 42b1cf44
......@@ -724,58 +724,56 @@ angular.module('AvatarCheck.task', ['ngRoute', 'AvatarCheck.http'])
}
$scope.goes = function(){
var checks = $(".checkOneBox:checked");
if(checks.length>0){
var go = function () {
$rootScope.closeBtn();
$rootScope.selectCount = 0;
for (var i = 0; i < $scope.selected.length; i++) {
$rootScope.selectCount =$rootScope.selectCount + parseInt($scope.selected[i].countyValidCount-$scope.selected[i].specialCount);
}
console.log("for",$rootScope.selectCount)
var arr = [];
var failedArr=[];
for (var i=0;i<checks.length;i++){
if(checks[i].value.length<11){
failedArr.push(checks[i].value)
}else{
arr.push(checks[i].value)
}
}
var json={
process:$rootScope.loginData.roleList[0].process,
name:$rootScope.loginData.name,
taskIdList:arr,
failedList:failedArr
$rootScope.selectCount = 0;
for (var i = 0; i < $scope.selected.length; i++) {
$rootScope.selectCount =$rootScope.selectCount + parseInt($scope.selected[i].countyValidCount-$scope.selected[i].specialCount);
}
console.log("for",$rootScope.selectCount)
var go = function () {
$rootScope.closeBtn();
var checks = $(".checkOneBox:checked");
if(checks.length>0){
var arr = [];
var failedArr=[];
for (var i=0;i<checks.length;i++){
if(checks[i].value.length<11){
failedArr.push(checks[i].value)
}else{
arr.push(checks[i].value)
}
console.log(json)
HttpService.updateTaskListProcess(json,function(data){
$scope.searchTaskList();
$scope.selected=[];
$rootScope.ableBtn();
$rootScope.closeThis();
})
}
var json={
process:$rootScope.loginData.roleList[0].process,
name:$rootScope.loginData.name,
taskIdList:arr,
failedList:failedArr
}
console.log(json)
HttpService.updateTaskListProcess(json,function(data){
$scope.searchTaskList();
$scope.selected=[];
$rootScope.ableBtn();
$rootScope.closeThis();
})
}else{
MessageService.showAlert("请选择转出的任务单");
}
ngDialog.open({
template: 'dialogs/gotoDistribute.html' + urlTimeStamp(),
width: 800,
cache: false,
closeByDocument:false,
controller: ['$scope', 'HttpService',function ($scope) {
$rootScope.closeThis=$scope.closeThisDialog;
$rootScope.ableBtn = function(){
$(".create").prop("disabled","false");
}
$rootScope.closeBtn = function(){
$(".create").prop("disabled","true");
}
$scope.confirmGoTo = go;
}]
})
}else{
MessageService.showAlert("请选择转出的任务单");
}
ngDialog.open({
template: 'dialogs/gotoDistribute.html' + urlTimeStamp(),
width: 800,
cache: false,
closeByDocument:false,
controller: ['$scope', 'HttpService',function ($scope) {
$rootScope.closeThis=$scope.closeThisDialog;
$rootScope.ableBtn = function(){
$(".create").prop("disabled","false");
}
$rootScope.closeBtn = function(){
$(".create").prop("disabled","true");
}
$scope.confirmGoTo = go;
}]
})
}
})
\ No newline at end of file
src/main/resources/static/views/task/taskListSorting.html
View file @ 42b1cf44
......@@ -56,10 +56,13 @@
</thead>
<tbody ng-repeat="task in type.countyList">
<tr>
<td ng-if="type.typeCode=='100'||(task.faileCount==0&&(task.countyValidCount-task.specialCount)==task.eWriteCount&&task.eWriteCount==task.recheckCount)">
<input type="checkbox" class="checkOneBox" ng-checked="isSelected(task)" value="{{task.taskId}}"
ng-click="updateSelection($event,task)"></td>
<td ng-if="type.typeCode!='100'&&(task.faileCount>0||(task.countyValidCount-task.specialCount)!=task.eWriteCount||task.eWriteCount!=task.recheckCount)"></td>
<!--<td ng-show="type.typeCode=='100'||(task.faileCount==0&&(task.countyValidCount-task.specialCount)
==task.eWriteCount&&task.eWriteCount==task.recheckCount)">-->
<td>
<input type="checkbox" class="checkOneBox"
ng-checked="isSelected(task)" value="{{task.taskId}}"
ng-click="updateSelection($event,task)">
</td>
<td class="mailbox-star"><b>{{task.taskId}}</b></td>
<td class="mailbox-subject">{{task.saveDate| date:'yyyy-MM-dd'}}</td>
<td class="mailbox-subject">{{task.groupList.length}}</td>
......
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