Переглянути джерело

修改成品粮粮情卡明细品种不回写和产地不可修改的问题

fanxw 4 роки тому
батько
коміт
1285643614

+ 6 - 1
pom.xml

@@ -41,9 +41,13 @@
41
 			<artifactId>spring-cloud-starter-config</artifactId>
41
 			<artifactId>spring-cloud-starter-config</artifactId>
42
 		</dependency>
42
 		</dependency>
43
 		<dependency>
43
 		<dependency>
44
+			<groupId>org.springframework.cloud</groupId>
45
+			<artifactId>spring-cloud-config-server</artifactId>
46
+		</dependency>
47
+		<dependency>
44
             <groupId>org.mybatis.spring.boot</groupId>
48
             <groupId>org.mybatis.spring.boot</groupId>
45
             <artifactId>mybatis-spring-boot-starter</artifactId>
49
             <artifactId>mybatis-spring-boot-starter</artifactId>
46
-            <version>1.3.1</version>
50
+            <version>1.3.2</version>
47
         </dependency>
51
         </dependency>
48
 		<dependency>
52
 		<dependency>
49
 			<groupId>org.springframework.cloud</groupId>
53
 			<groupId>org.springframework.cloud</groupId>
@@ -119,6 +123,7 @@
119
 			<plugin>
123
 			<plugin>
120
 				<groupId>org.springframework.boot</groupId>
124
 				<groupId>org.springframework.boot</groupId>
121
 				<artifactId>spring-boot-maven-plugin</artifactId>
125
 				<artifactId>spring-boot-maven-plugin</artifactId>
126
+				<version>2.5.5</version>
122
 			</plugin>
127
 			</plugin>
123
 		</plugins>
128
 		</plugins>
124
 		<!-- 如果不添加此节点mybatis的mapper.xml文件都会被漏掉。 -->
129
 		<!-- 如果不添加此节点mybatis的mapper.xml文件都会被漏掉。 -->

+ 5 - 4
src/main/resources/static/app/storage/grainCard/controller/productGrainAddCtrl.js

@@ -27,7 +27,8 @@ angular.module('app.storage').controller("productGrainAddCtrl",
27
                 $scope.cerealsCard.scrq = $filter('date')(data.data.scrq, "yyyy-MM-dd");
27
                 $scope.cerealsCard.scrq = $filter('date')(data.data.scrq, "yyyy-MM-dd");
28
                 $scope.cerealsCard.jkrq = $filter('date')(data.data.jkrq, "yyyy-MM-dd");
28
                 $scope.cerealsCard.jkrq = $filter('date')(data.data.jkrq, "yyyy-MM-dd");
29
                 $scope.cerealsCard.buildDate = $filter('date')(data.data.buildDate, "yyyy-MM-dd");
29
                 $scope.cerealsCard.buildDate = $filter('date')(data.data.buildDate, "yyyy-MM-dd");
30
-                $scope.getAreaData(); // 树形下拉
30
+                $scope.getAreaData(); // 树形下拉产地
31
+                $scope.getsGrainDetailKind(); //树形下拉明细品种
31
             }, function (data) {
32
             }, function (data) {
32
                 console.log(data);
33
                 console.log(data);
33
             });
34
             });
@@ -140,7 +141,7 @@ angular.module('app.storage').controller("productGrainAddCtrl",
140
                 console.log(data);
141
                 console.log(data);
141
             })
142
             })
142
         };
143
         };
143
-        $scope.getAreaData();
144
+        //$scope.getAreaData();
144
 
145
 
145
         // 明细品种回显
146
         // 明细品种回显
146
         /*$scope.mxpzhx = function(){
147
         /*$scope.mxpzhx = function(){
@@ -187,8 +188,8 @@ angular.module('app.storage').controller("productGrainAddCtrl",
187
             $scope.loadDataById($stateParams.id); // 条件id查询对应数据
188
             $scope.loadDataById($stateParams.id); // 条件id查询对应数据
188
             $scope.findWare($stateParams.spareOne); // 获取仓房下货位
189
             $scope.findWare($stateParams.spareOne); // 获取仓房下货位
189
             $scope.loadLYDJ($stateParams.lypzName); // 成品粮品种
190
             $scope.loadLYDJ($stateParams.lypzName); // 成品粮品种
190
-            $scope.getAreaData(); // 树形下拉
191
-            $scope.getsGrainDetailKind();
191
+            //$scope.getAreaData(); // 树形下拉
192
+            //$scope.getsGrainDetailKind();
192
         } else { // 新增保存
193
         } else { // 新增保存
193
             $scope.isNotEdit = false; // 新增禁用修改仓房货位
194
             $scope.isNotEdit = false; // 新增禁用修改仓房货位
194
         }
195
         }

+ 3 - 3
src/main/resources/static/app/storage/grainCard/views/productGrain-add.html

@@ -59,7 +59,7 @@
59
                                                 </section>
59
                                                 </section>
60
                                             </th>
60
                                             </th>
61
                                             <th width='10%'>
61
                                             <th width='10%'>
62
-                                                <label class="label">明细品种<span style="color: red;">*</span></label>
62
+                                                <label class="label">明细品种</label>
63
                                             </th>
63
                                             </th>
64
                                             <th width='20%'>
64
                                             <th width='20%'>
65
                                                 <label class="select" id="grainDetailKind-label">
65
                                                 <label class="select" id="grainDetailKind-label">
@@ -117,13 +117,13 @@
117
                                                 </section>
117
                                                 </section>
118
                                             </th>
118
                                             </th>
119
                                             <th style="border-bottom-width:1px">
119
                                             <th style="border-bottom-width:1px">
120
-                                                <label class="label" style="margin-top: 9px;text-align: center;">产地<span style="color: red;margin-left: 5px;text-align: center;">*</span></label>
120
+                                                <label class="label" style="margin-top: 9px;text-align: center;">产地</label>
121
                                             </th>
121
                                             </th>
122
                                             <th style="border-bottom-width:1px">
122
                                             <th style="border-bottom-width:1px">
123
                                                 <section>
123
                                                 <section>
124
                                                     <label class="select">
124
                                                     <label class="select">
125
+                                                        <!--disabled-tree="isNotEdit"-->
125
                                                         <multi-select-tree
126
                                                         <multi-select-tree
126
-                                                                disabled-tree="isNotEdit"
127
                                                                 data-input-model="grainProducingAreaTreeData"
127
                                                                 data-input-model="grainProducingAreaTreeData"
128
                                                                 data-default-label="请选择" name="lycdCode"
128
                                                                 data-default-label="请选择" name="lycdCode"
129
                                                                 multi-select="false"
129
                                                                 multi-select="false"