Merge branch 'master' of http://101.36.160.140:21044/depot-tianjin/depot-web-tianjin

src/main/resources/static/app/storage/controller/qualitycheckAssayCtrl.js

@@ -88,6 +88,7 @@ angular.module('app.storage')
 
         //自检：处理、查看、修改
         $scope.doProcess = function (id, buttype, typeUpdate) {
+            console.log(typeUpdate)
         	if (typeUpdate == 3) {
             	$state.go('app.storage.qualitycheck.outlist.outeditAssay',{id : id, isNotEdit : false, buttype : buttype});
         	} else if (typeUpdate == 0 || typeUpdate == 4 || typeUpdate == 6) {
@@ -297,6 +298,13 @@ angular.module('app.storage')
                 if($stateParams.buttype == "add"){
                 	$scope.qualitycheck.checkTime = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");
                 	$scope.qualitycheck.checkResult = "0"; //检验结果:默认给合格
+                    $scope.qualitycheck.acceptUnite = $rootScope.orgInfo.orgName; // 检验机构
+                    $scope.qualitycheck.commitPeople = $rootScope.userInfo.realName; // 提交人
+                    $scope.qualitycheck.commitTime = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");// 提交时间
+                }
+                if ("update" === $stateParams.buttype) {
+                    $scope.qualitycheck.commitPeople = $rootScope.userInfo.realName; // 提交人
+                    $scope.qualitycheck.commitTime = $filter('date')(new Date(), "yyyy-MM-dd HH:mm:ss");// 提交时间
                 }
                 $scope.qualitycheck.checkTime = $filter('date')($scope.qualitycheck.checkTime, "yyyy-MM-dd HH:mm:ss");
                 $scope.qualitycheck.applyCheckTime = $filter('date')($scope.qualitycheck.applyCheckTime, "yyyy-MM-dd");

src/main/resources/static/app/storage/views/qualitycheck/qualitycheck-firstcheck-edit.html

@@ -259,7 +259,7 @@
 											<section class="col col-3">
 												<label class="label">检验机构：<span style="color: red;">*</span></label>
 												<label class="input">
-													<input type="text" ng-model="qualitycheck.acceptUnite" ng-readonly="isNotEdit" name="acceptUnite"
+													<input type="text" ng-model="qualitycheck.acceptUnite" ng-readonly="true" name="acceptUnite"
 														   placeholder="检验机构" required>
 												</label>
 											</section>
@@ -1787,6 +1787,23 @@
 									</tr>
 									<!--第四3个tr结束 -->
 								</table>
+								<!--提交人 提交时间-->
+								<fieldset>
+									<div class="row">
+										<section class="col col-3">
+											<label class="label">提交人:</label>
+											<label class="input">
+												<input type="text" ng-model="qualitycheck.commitPeople" name="commitPeople" ng-readonly="true" required>
+											</label>
+										</section>
+										<section class="col col-3">
+											<label class="label">提交时间:</label>
+											<label class="input">
+												<input type="text" ng-model="qualitycheck.commitTime" name="commitTime" ng-readonly="true" required>
+											</label>
+										</section>
+									</div>
+								</fieldset>
 								<!-- 附件 end -->
 									<fieldset>
 										<footer class="modal-footer text-align-center">