Эх сурвалжийг харах

pref: 处理店铺审核增加备注信息

wangcz 7 жил өмнө
parent
commit
b768ae6290

+ 10 - 2
src/main/webapp/resources/js/vendor/controllers/b2b/apCheck.js

@@ -659,7 +659,11 @@ define(['app/app'], function (app) {
                       sendcode: '',
                       whname: '',
                       custUserUU: '',
-                      sourceDate: ''
+                      sourceDate: '',
+                      sendId: null,
+                      sendQty: null,
+                      sendPrice: null,
+                      payment: null
                   };
 
                   //应收对账单明细行来源表信息
@@ -752,7 +756,11 @@ define(['app/app'], function (app) {
                       $scope.item.sendcode = check.sendcode;
                       $scope.item.whname = check.whname;
                       $scope.item.custUserUU = check.custuseruu;
-                      $scope.item.sourceDate = check.pidate
+                      $scope.item.sourceDate = check.pidate;
+                      $scope.item.sendId = check.sendId;
+                      $scope.item.sendQty = check.sendQty;
+                      $scope.item.sendPrice = check.sendPrice;
+                      $scope.item.payment = check.payment;
                       //来源表相关信息
                       $scope.sourceInfo.sourceid = check.sourceid;
                       $scope.sourceInfo.sourcetable = check.sourcetable;

+ 8 - 0
src/main/webapp/resources/view/admin/store_qualification_maintenance.html

@@ -472,6 +472,10 @@
 								</select>
 							</div>
 						</div>
+						<div class="row">
+							<div class="col-sm-2">备注</div>
+							<div class="col-sm-9"><input type="text" class="form-control" maxlength="100" title="remark" ng-disabled="application.status !== 'PREPARE' && !updateState" ng-model="enQualification.remark"/></div>
+						</div>
 						<div class="row" ng-if="enQualification.status === '其他'">
 							<div class="col-sm-2"></div>
 							<div class="col-sm-9"><input type="text" class="form-control"  placeholder="请填写原因" title="reason" ng-disabled="application.status !== 'PREPARE' && !updateState" ng-model="enQualification.reason"/></div>
@@ -523,6 +527,10 @@
 								</select>
 							</div>
 						</div>
+						<div class="row">
+							<div class="col-sm-2">备注</div>
+							<div class="col-sm-9"><input type="text" class="form-control" title="remark" maxlength="100" ng-disabled="application.status !== 'PREPARE' && !updateState" ng-model="enQualification.remark"/></div>
+						</div>
 						<div class="row" ng-if="enQualification.status === '其他'">
 							<div class="col-sm-2"></div>
 							<div class="col-sm-9"><input type="text" class="form-control"  placeholder="请填写原因" title="reason" ng-model="enQualification.reason"/></div>

+ 1 - 1
src/main/webapp/resources/view/vendor/b2b/apCheck.html

@@ -1184,7 +1184,7 @@
                               <td width="70">{{::(childs.orderprice || 0)*(childs.thischeckqty || 0) | number:2}}</td>
                               <td width="100" ng-if="childs.haveChecked === 1">
                                   <div>{{::childs.recorder || '-'}}</div>
-                                  <div>{{::childs.apCheckDate | date:'yyyy年MM月dd日'  || '-'}}</div>
+                                  <div>{{::childs.apCheckDate | date:'yyyy-MM-dd'  || '-'}}</div>
                               </td>
                               <td width="100" ng-if="childs.haveChecked !== 1">
                                   未对账