Kezdőlap Felfedezés Súgó
Regisztráció Bejelentkezés
wangchao
/
yiliangyiyun-pc-jj
1
0
Másolás 0
Fájlok Problémák 0 Beolvasztási kérések 0 Wiki
Forráskód Böngészése

前端

高敬炎 2 éve
szülő
c22ca9d3df
commit
91bf3598ba
31 módosított fájl, 964 hozzáadás és 1015 törlés
Osztott Nézet Diff Statisztika Mutatása
  1. 1 1
      public/cdn/element-ui/2.13.2/theme-chalk/index.css
  2. 53 448
      public/static/iconfont/demo_index.html
  3. 12 82
      public/static/iconfont/iconfont.css
  4. 0 0
      public/static/iconfont/iconfont.js
  5. 28 147
      public/static/iconfont/iconfont.json
  6. BIN
      public/static/iconfont/iconfont.ttf
  7. 11 0
      src/App.vue
  8. 2 1
      src/api/V2/speedGoods.js
  9. 4 0
      src/api/V2/warehouse/index.js
  10. 9 6
      src/components/WsUpload/index.vue
  11. 12 0
      src/global.js
  12. 0 1
      src/main.js
  13. 27 1
      src/model/speedGoods.js
  14. 8 2
      src/model/warehouse/index.js
  15. 3 2
      src/router/index.js
  16. 22 6
      src/store/modules/permission.js
  17. 3 3
      src/store/modules/user.js
  18. 1 1
      src/styles/custom-style.scss
  19. 0 1
      src/utils/util.js
  20. 4 4
      src/views/boundManagement/component/route.js
  21. 218 75
      src/views/boundManagement/outbound.vue
  22. 4 4
      src/views/cost/component/route.js
  23. 94 38
      src/views/cost/cost.vue
  24. 4 4
      src/views/customer/component/route.js
  25. 25 18
      src/views/customer/customer.vue
  26. 4 4
      src/views/record/component/route.js
  27. 176 64
      src/views/record/record.vue
  28. 6 6
      src/views/setup/component/route.js
  29. 13 8
      src/views/setup/goodsSettings.vue
  30. 5 11
      src/views/setup/warehouseSettings.vue
  31. 215 77
      src/views/warehousing/index.vue

+ 1 - 1
public/cdn/element-ui/2.13.2/theme-chalk/index.css
Fájl Megtekintése 

@@ -1785,7 +1785,7 @@
 
 .el-submenu [class^='el-icon-'] {
 
   vertical-align: middle;
 
   margin-right: 5px;
 
-  width: 24px;
 
+  /* width: 24px; */
 
   text-align: center;
 
   font-size: 18px;
 
 }

+ 53 - 448
public/static/iconfont/demo_index.html
Fájl Megtekintése 

@@ -3,8 +3,8 @@
 
 <head>
 
   <meta charset="utf-8"/>
 
   <title>iconfont Demo</title>
 
-  <link rel="shortcut icon" href="//img.alicdn.com/imgextra/i2/O1CN01ZyAlrn1MwaMhqz36G_!!6000000001499-73-tps-64-64.ico" type="image/x-icon"/>
 
-  <link rel="icon" type="image/svg+xml" href="//img.alicdn.com/imgextra/i4/O1CN01EYTRnJ297D6vehehJ_!!6000000008020-55-tps-64-64.svg"/>
 
+  <link rel="shortcut icon" href="//img.alicdn.com/imgextra/i4/O1CN01Z5paLz1O0zuCC7osS_!!6000000001644-55-tps-83-82.svg" type="image/x-icon"/>
 
+  <link rel="icon" type="image/svg+xml" href="//img.alicdn.com/imgextra/i4/O1CN01Z5paLz1O0zuCC7osS_!!6000000001644-55-tps-83-82.svg"/>
 
   <link rel="stylesheet" href="https://g.alicdn.com/thx/cube/1.3.2/cube.min.css">
 
   <link rel="stylesheet" href="demo.css">
 
   <link rel="stylesheet" href="iconfont.css">
 
@@ -47,149 +47,45 @@
 
         <li class="dib"><span>Symbol</span></li>
 
       </ul>
 
       
-      <a href="https://www.iconfont.cn/manage/index?manage_type=myprojects&projectId=2554236" target="_blank" class="nav-more">查看项目</a>
 
-      
     </div>
 
     <div class="tab-container">
 
       <div class="content unicode" style="display: block;">
 
           <ul class="icon_lists dib-box">
 
           
             <li class="dib">
 
-              <span class="icon iconfont">&#xe615;</span>
 
-                <div class="name">kehuzijin</div>
 
-                <div class="code-name">&amp;#xe615;</div>
 
-              </li>
 
-          
-            <li class="dib">
 
-              <span class="icon iconfont">&#xe614;</span>
 
-                <div class="name">shougou</div>
 
-                <div class="code-name">&amp;#xe614;</div>
 
-              </li>
 
-          
-            <li class="dib">
 
-              <span class="icon iconfont">&#xe613;</span>
 
-                <div class="name">chukuguanli备份</div>
 
-                <div class="code-name">&amp;#xe613;</div>
 
-              </li>
 
-          
-            <li class="dib">
 
-              <span class="icon iconfont">&#xe612;</span>
 
-                <div class="name">gongzuotongzi</div>
 
-                <div class="code-name">&amp;#xe612;</div>
 
-              </li>
 
-          
-            <li class="dib">
 
-              <span class="icon iconfont">&#xe610;</span>
 
-                <div class="name">kehuguanli</div>
 
-                <div class="code-name">&amp;#xe610;</div>
 
-              </li>
 
-          
-            <li class="dib">
 
-              <span class="icon iconfont">&#xe60f;</span>
 
-                <div class="name">caiwuguanli</div>
 
-                <div class="code-name">&amp;#xe60f;</div>
 
-              </li>
 
-          
-            <li class="dib">
 
-              <span class="icon iconfont">&#xe60e;</span>
 
-                <div class="name">shenhe</div>
 
-                <div class="code-name">&amp;#xe60e;</div>
 
-              </li>
 
-          
-            <li class="dib">
 
-              <span class="icon iconfont">&#xe60d;</span>
 
-                <div class="name">caigouguanli</div>
 
-                <div class="code-name">&amp;#xe60d;</div>
 
-              </li>
 
-          
-            <li class="dib">
 
-              <span class="icon iconfont">&#xe60c;</span>
 
-                <div class="name">xiaoshou2</div>
 
-                <div class="code-name">&amp;#xe60c;</div>
 
-              </li>
 
-          
-            <li class="dib">
 
-              <span class="icon iconfont">&#xe60b;</span>
 
-                <div class="name">tongjibaobiao</div>
 
-                <div class="code-name">&amp;#xe60b;</div>
 
-              </li>
 
-          
-            <li class="dib">
 
-              <span class="icon iconfont">&#xe641;</span>
 
-                <div class="name">对</div>
 
-                <div class="code-name">&amp;#xe641;</div>
 
-              </li>
 
-          
-            <li class="dib">
 
-              <span class="icon iconfont">&#xe60a;</span>
 
-                <div class="name">易粮易运</div>
 
-                <div class="code-name">&amp;#xe60a;</div>
 
+              <span class="icon iconfont">&#xe61e;</span>
 
+                <div class="name">出入库记录</div>
 
+                <div class="code-name">&amp;#xe61e;</div>
 
               </li>
 
           
             <li class="dib">
 
-              <span class="icon iconfont">&#xe605;</span>
 
-                <div class="name">历史</div>
 
-                <div class="code-name">&amp;#xe605;</div>
 
+              <span class="icon iconfont">&#xe892;</span>
 
+                <div class="name">设置</div>
 
+                <div class="code-name">&amp;#xe892;</div>
 
               </li>
 
           
             <li class="dib">
 
-              <span class="icon iconfont">&#xe6c9;</span>
 
-                <div class="name">关  闭</div>
 
-                <div class="code-name">&amp;#xe6c9;</div>
 
-              </li>
 
-          
-            <li class="dib">
 
-              <span class="icon iconfont">&#xe63a;</span>
 
-                <div class="name">眼睛-睁眼</div>
 
-                <div class="code-name">&amp;#xe63a;</div>
 
-              </li>
 
-          
-            <li class="dib">
 
-              <span class="icon iconfont">&#xe63b;</span>
 
-                <div class="name">眼睛-闭眼</div>
 
-                <div class="code-name">&amp;#xe63b;</div>
 
-              </li>
 
-          
-            <li class="dib">
 
-              <span class="icon iconfont">&#xe609;</span>
 
-                <div class="name">yunshuguanli</div>
 
-                <div class="code-name">&amp;#xe609;</div>
 
+              <span class="icon iconfont">&#xe804;</span>
 
+                <div class="name">客户</div>
 
+                <div class="code-name">&amp;#xe804;</div>
 
               </li>
 
           
             <li class="dib">
 
               <span class="icon iconfont">&#xe601;</span>
 
-                <div class="name">hetong</div>
 
+                <div class="name">出库</div>
 
                 <div class="code-name">&amp;#xe601;</div>
 
               </li>
 
           
-            <li class="dib">
 
-              <span class="icon iconfont">&#xe602;</span>
 
-                <div class="name">index</div>
 
-                <div class="code-name">&amp;#xe602;</div>
 
-              </li>
 
-          
-            <li class="dib">
 
-              <span class="icon iconfont">&#xe603;</span>
 
-                <div class="name">shouqi</div>
 
-                <div class="code-name">&amp;#xe603;</div>
 
-              </li>
 
-          
-            <li class="dib">
 
-              <span class="icon iconfont">&#xe604;</span>
 
-                <div class="name">zhankai</div>
 
-                <div class="code-name">&amp;#xe604;</div>
 
-              </li>
 
-          
             <li class="dib">
 
               <span class="icon iconfont">&#xe606;</span>
 
-                <div class="name">cangku</div>
 
+                <div class="name">入库</div>
 
                 <div class="code-name">&amp;#xe606;</div>
 
               </li>
 
           
             <li class="dib">
 
-              <span class="icon iconfont">&#xe607;</span>
 
-                <div class="name">renwuguanli</div>
 
-                <div class="code-name">&amp;#xe607;</div>
 
+              <span class="icon iconfont">&#xe521;</span>
 
+                <div class="name">费用</div>
 
+                <div class="code-name">&amp;#xe521;</div>
 
               </li>
 
           
           </ul>
 
@@ -210,9 +106,7 @@
 
 <pre><code class="language-css"
 
 >@font-face {
 
   font-family: 'iconfont';
 
-  src: url('iconfont.woff2?t=1635728227466') format('woff2'),
 
-       url('iconfont.woff?t=1635728227466') format('woff'),
 
-       url('iconfont.ttf?t=1635728227466') format('truetype');
 
+  src: url('iconfont.ttf?t=1680856804881') format('truetype');
 
 }
 
 </code></pre>
 
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
 
@@ -239,209 +133,56 @@
 
         <ul class="icon_lists dib-box">
 
           
           <li class="dib">
 
-            <span class="icon iconfont icon-kehuzijin"></span>
 
-            <div class="name">
 
-              kehuzijin
 
-            </div>
 
-            <div class="code-name">.icon-kehuzijin
 
-            </div>
 
-          </li>
 
-          
-          <li class="dib">
 
-            <span class="icon iconfont icon-a-4-shougoubeifen"></span>
 
-            <div class="name">
 
-              shougou
 
-            </div>
 
-            <div class="code-name">.icon-a-4-shougoubeifen
 
-            </div>
 
-          </li>
 
-          
-          <li class="dib">
 
-            <span class="icon iconfont icon-chukuguanlibeifen"></span>
 
-            <div class="name">
 
-              chukuguanli备份
 
-            </div>
 
-            <div class="code-name">.icon-chukuguanlibeifen
 
-            </div>
 
-          </li>
 
-          
-          <li class="dib">
 
-            <span class="icon iconfont icon-a-tongzhibeifen2"></span>
 
-            <div class="name">
 
-              gongzuotongzi
 
-            </div>
 
-            <div class="code-name">.icon-a-tongzhibeifen2
 
-            </div>
 
-          </li>
 
-          
-          <li class="dib">
 
-            <span class="icon iconfont icon-kehuguanli"></span>
 
-            <div class="name">
 
-              kehuguanli
 
-            </div>
 
-            <div class="code-name">.icon-kehuguanli
 
-            </div>
 
-          </li>
 
-          
-          <li class="dib">
 
-            <span class="icon iconfont icon-caiwuguanli"></span>
 
-            <div class="name">
 
-              caiwuguanli
 
-            </div>
 
-            <div class="code-name">.icon-caiwuguanli
 
-            </div>
 
-          </li>
 
-          
-          <li class="dib">
 
-            <span class="icon iconfont icon-shenhe"></span>
 
-            <div class="name">
 
-              shenhe
 
-            </div>
 
-            <div class="code-name">.icon-shenhe
 
-            </div>
 
-          </li>
 
-          
-          <li class="dib">
 
-            <span class="icon iconfont icon-caigouguanli"></span>
 
-            <div class="name">
 
-              caigouguanli
 
-            </div>
 
-            <div class="code-name">.icon-caigouguanli
 
-            </div>
 
-          </li>
 
-          
-          <li class="dib">
 
-            <span class="icon iconfont icon-xiaoshou2"></span>
 
-            <div class="name">
 
-              xiaoshou2
 
-            </div>
 
-            <div class="code-name">.icon-xiaoshou2
 
-            </div>
 
-          </li>
 
-          
-          <li class="dib">
 
-            <span class="icon iconfont icon-tongjibaobiao"></span>
 
-            <div class="name">
 
-              tongjibaobiao
 
-            </div>
 
-            <div class="code-name">.icon-tongjibaobiao
 
-            </div>
 
-          </li>
 
-          
-          <li class="dib">
 
-            <span class="icon iconfont icon-dui"></span>
 
+            <span class="icon iconfont icon-churukujilu"></span>
 
             <div class="name">
 
-              对
 
+              出入库记录
 
             </div>
 
-            <div class="code-name">.icon-dui
 
+            <div class="code-name">.icon-churukujilu
 
             </div>
 
           </li>
 
           
           <li class="dib">
 
-            <span class="icon iconfont icon-yiliangyiyun"></span>
 
+            <span class="icon iconfont icon-shezhi"></span>
 
             <div class="name">
 
-              易粮易运
 
+              设置
 
             </div>
 
-            <div class="code-name">.icon-yiliangyiyun
 
+            <div class="code-name">.icon-shezhi
 
             </div>
 
           </li>
 
           
           <li class="dib">
 
-            <span class="icon iconfont icon-lishi"></span>
 
+            <span class="icon iconfont icon-kehu"></span>
 
             <div class="name">
 
-              历史
 
+              客户
 
             </div>
 
-            <div class="code-name">.icon-lishi
 
+            <div class="code-name">.icon-kehu
 
             </div>
 
           </li>
 
           
           <li class="dib">
 
-            <span class="icon iconfont icon-guanbi"></span>
 
+            <span class="icon iconfont icon-chuku"></span>
 
             <div class="name">
 
-              关  闭
 
+              出库
 
             </div>
 
-            <div class="code-name">.icon-guanbi
 
+            <div class="code-name">.icon-chuku
 
             </div>
 
           </li>
 
           
           <li class="dib">
 
-            <span class="icon iconfont icon-yanjing-zhengyan"></span>
 
+            <span class="icon iconfont icon-ruku"></span>
 
             <div class="name">
 
-              眼睛-睁眼
 
+              入库
 
             </div>
 
-            <div class="code-name">.icon-yanjing-zhengyan
 
+            <div class="code-name">.icon-ruku
 
             </div>
 
           </li>
 
           
           <li class="dib">
 
-            <span class="icon iconfont icon-yanjing-biyan"></span>
 
+            <span class="icon iconfont icon-feiyong"></span>
 
             <div class="name">
 
-              眼睛-闭眼
 
+              费用
 
             </div>
 
-            <div class="code-name">.icon-yanjing-biyan
 
-            </div>
 
-          </li>
 
-          
-          <li class="dib">
 
-            <span class="icon iconfont icon-yunshu2"></span>
 
-            <div class="name">
 
-              yunshuguanli
 
-            </div>
 
-            <div class="code-name">.icon-yunshu2
 
-            </div>
 
-          </li>
 
-          
-          <li class="dib">
 
-            <span class="icon iconfont icon-hetongguanli"></span>
 
-            <div class="name">
 
-              hetong
 
-            </div>
 
-            <div class="code-name">.icon-hetongguanli
 
-            </div>
 
-          </li>
 
-          
-          <li class="dib">
 
-            <span class="icon iconfont icon-index-copy"></span>
 
-            <div class="name">
 
-              index
 
-            </div>
 
-            <div class="code-name">.icon-index-copy
 
-            </div>
 
-          </li>
 
-          
-          <li class="dib">
 
-            <span class="icon iconfont icon-shouqi"></span>
 
-            <div class="name">
 
-              shouqi
 
-            </div>
 
-            <div class="code-name">.icon-shouqi
 
-            </div>
 
-          </li>
 
-          
-          <li class="dib">
 
-            <span class="icon iconfont icon-zhankai"></span>
 
-            <div class="name">
 
-              zhankai
 
-            </div>
 
-            <div class="code-name">.icon-zhankai
 
-            </div>
 
-          </li>
 
-          
-          <li class="dib">
 
-            <span class="icon iconfont icon-cangkubeifen"></span>
 
-            <div class="name">
 
-              cangku
 
-            </div>
 
-            <div class="code-name">.icon-cangkubeifen
 
-            </div>
 
-          </li>
 
-          
-          <li class="dib">
 
-            <span class="icon iconfont icon-renwuguanli"></span>
 
-            <div class="name">
 
-              renwuguanli
 
-            </div>
 
-            <div class="code-name">.icon-renwuguanli
 
+            <div class="code-name">.icon-feiyong
 
             </div>
 
           </li>
 
           
@@ -474,186 +215,50 @@
 
           
             <li class="dib">
 
                 <svg class="icon svg-icon" aria-hidden="true">
 
-                  <use xlink:href="#icon-kehuzijin"></use>
 
-                </svg>
 
-                <div class="name">kehuzijin</div>
 
-                <div class="code-name">#icon-kehuzijin</div>
 
-            </li>
 
-          
-            <li class="dib">
 
-                <svg class="icon svg-icon" aria-hidden="true">
 
-                  <use xlink:href="#icon-a-4-shougoubeifen"></use>
 
-                </svg>
 
-                <div class="name">shougou</div>
 
-                <div class="code-name">#icon-a-4-shougoubeifen</div>
 
-            </li>
 
-          
-            <li class="dib">
 
-                <svg class="icon svg-icon" aria-hidden="true">
 
-                  <use xlink:href="#icon-chukuguanlibeifen"></use>
 
-                </svg>
 
-                <div class="name">chukuguanli备份</div>
 
-                <div class="code-name">#icon-chukuguanlibeifen</div>
 
-            </li>
 
-          
-            <li class="dib">
 
-                <svg class="icon svg-icon" aria-hidden="true">
 
-                  <use xlink:href="#icon-a-tongzhibeifen2"></use>
 
-                </svg>
 
-                <div class="name">gongzuotongzi</div>
 
-                <div class="code-name">#icon-a-tongzhibeifen2</div>
 
-            </li>
 
-          
-            <li class="dib">
 
-                <svg class="icon svg-icon" aria-hidden="true">
 
-                  <use xlink:href="#icon-kehuguanli"></use>
 
-                </svg>
 
-                <div class="name">kehuguanli</div>
 
-                <div class="code-name">#icon-kehuguanli</div>
 
-            </li>
 
-          
-            <li class="dib">
 
-                <svg class="icon svg-icon" aria-hidden="true">
 
-                  <use xlink:href="#icon-caiwuguanli"></use>
 
-                </svg>
 
-                <div class="name">caiwuguanli</div>
 
-                <div class="code-name">#icon-caiwuguanli</div>
 
-            </li>
 
-          
-            <li class="dib">
 
-                <svg class="icon svg-icon" aria-hidden="true">
 
-                  <use xlink:href="#icon-shenhe"></use>
 
-                </svg>
 
-                <div class="name">shenhe</div>
 
-                <div class="code-name">#icon-shenhe</div>
 
-            </li>
 
-          
-            <li class="dib">
 
-                <svg class="icon svg-icon" aria-hidden="true">
 
-                  <use xlink:href="#icon-caigouguanli"></use>
 
-                </svg>
 
-                <div class="name">caigouguanli</div>
 
-                <div class="code-name">#icon-caigouguanli</div>
 
-            </li>
 
-          
-            <li class="dib">
 
-                <svg class="icon svg-icon" aria-hidden="true">
 
-                  <use xlink:href="#icon-xiaoshou2"></use>
 
-                </svg>
 
-                <div class="name">xiaoshou2</div>
 
-                <div class="code-name">#icon-xiaoshou2</div>
 
-            </li>
 
-          
-            <li class="dib">
 
-                <svg class="icon svg-icon" aria-hidden="true">
 
-                  <use xlink:href="#icon-tongjibaobiao"></use>
 
-                </svg>
 
-                <div class="name">tongjibaobiao</div>
 
-                <div class="code-name">#icon-tongjibaobiao</div>
 
-            </li>
 
-          
-            <li class="dib">
 
-                <svg class="icon svg-icon" aria-hidden="true">
 
-                  <use xlink:href="#icon-dui"></use>
 
-                </svg>
 
-                <div class="name">对</div>
 
-                <div class="code-name">#icon-dui</div>
 
-            </li>
 
-          
-            <li class="dib">
 
-                <svg class="icon svg-icon" aria-hidden="true">
 
-                  <use xlink:href="#icon-yiliangyiyun"></use>
 
-                </svg>
 
-                <div class="name">易粮易运</div>
 
-                <div class="code-name">#icon-yiliangyiyun</div>
 
-            </li>
 
-          
-            <li class="dib">
 
-                <svg class="icon svg-icon" aria-hidden="true">
 
-                  <use xlink:href="#icon-lishi"></use>
 
-                </svg>
 
-                <div class="name">历史</div>
 
-                <div class="code-name">#icon-lishi</div>
 
-            </li>
 
-          
-            <li class="dib">
 
-                <svg class="icon svg-icon" aria-hidden="true">
 
-                  <use xlink:href="#icon-guanbi"></use>
 
-                </svg>
 
-                <div class="name">关  闭</div>
 
-                <div class="code-name">#icon-guanbi</div>
 
-            </li>
 
-          
-            <li class="dib">
 
-                <svg class="icon svg-icon" aria-hidden="true">
 
-                  <use xlink:href="#icon-yanjing-zhengyan"></use>
 
-                </svg>
 
-                <div class="name">眼睛-睁眼</div>
 
-                <div class="code-name">#icon-yanjing-zhengyan</div>
 
-            </li>
 
-          
-            <li class="dib">
 
-                <svg class="icon svg-icon" aria-hidden="true">
 
-                  <use xlink:href="#icon-yanjing-biyan"></use>
 
-                </svg>
 
-                <div class="name">眼睛-闭眼</div>
 
-                <div class="code-name">#icon-yanjing-biyan</div>
 
-            </li>
 
-          
-            <li class="dib">
 
-                <svg class="icon svg-icon" aria-hidden="true">
 
-                  <use xlink:href="#icon-yunshu2"></use>
 
-                </svg>
 
-                <div class="name">yunshuguanli</div>
 
-                <div class="code-name">#icon-yunshu2</div>
 
-            </li>
 
-          
-            <li class="dib">
 
-                <svg class="icon svg-icon" aria-hidden="true">
 
-                  <use xlink:href="#icon-hetongguanli"></use>
 
+                  <use xlink:href="#icon-churukujilu"></use>
 
                 </svg>
 
-                <div class="name">hetong</div>
 
-                <div class="code-name">#icon-hetongguanli</div>
 
+                <div class="name">出入库记录</div>
 
+                <div class="code-name">#icon-churukujilu</div>
 
             </li>
 
           
             <li class="dib">
 
                 <svg class="icon svg-icon" aria-hidden="true">
 
-                  <use xlink:href="#icon-index-copy"></use>
 
+                  <use xlink:href="#icon-shezhi"></use>
 
                 </svg>
 
-                <div class="name">index</div>
 
-                <div class="code-name">#icon-index-copy</div>
 
+                <div class="name">设置</div>
 
+                <div class="code-name">#icon-shezhi</div>
 
             </li>
 
           
             <li class="dib">
 
                 <svg class="icon svg-icon" aria-hidden="true">
 
-                  <use xlink:href="#icon-shouqi"></use>
 
+                  <use xlink:href="#icon-kehu"></use>
 
                 </svg>
 
-                <div class="name">shouqi</div>
 
-                <div class="code-name">#icon-shouqi</div>
 
+                <div class="name">客户</div>
 
+                <div class="code-name">#icon-kehu</div>
 
             </li>
 
           
             <li class="dib">
 
                 <svg class="icon svg-icon" aria-hidden="true">
 
-                  <use xlink:href="#icon-zhankai"></use>
 
+                  <use xlink:href="#icon-chuku"></use>
 
                 </svg>
 
-                <div class="name">zhankai</div>
 
-                <div class="code-name">#icon-zhankai</div>
 
+                <div class="name">出库</div>
 
+                <div class="code-name">#icon-chuku</div>
 
             </li>
 
           
             <li class="dib">
 
                 <svg class="icon svg-icon" aria-hidden="true">
 
-                  <use xlink:href="#icon-cangkubeifen"></use>
 
+                  <use xlink:href="#icon-ruku"></use>
 
                 </svg>
 
-                <div class="name">cangku</div>
 
-                <div class="code-name">#icon-cangkubeifen</div>
 
+                <div class="name">入库</div>
 
+                <div class="code-name">#icon-ruku</div>
 
             </li>
 
           
             <li class="dib">
 
                 <svg class="icon svg-icon" aria-hidden="true">
 
-                  <use xlink:href="#icon-renwuguanli"></use>
 
+                  <use xlink:href="#icon-feiyong"></use>
 
                 </svg>
 
-                <div class="name">renwuguanli</div>
 
-                <div class="code-name">#icon-renwuguanli</div>
 
+                <div class="name">费用</div>
 
+                <div class="code-name">#icon-feiyong</div>
 
             </li>
 
           
           </ul>

+ 12 - 82
public/static/iconfont/iconfont.css
Fájl Megtekintése 

@@ -1,8 +1,6 @@
 
 @font-face {
 
-  font-family: "iconfont"; /* Project id 2554236 */
 
-  src: url('iconfont.woff2?t=1635728227466') format('woff2'),
 
-       url('iconfont.woff?t=1635728227466') format('woff'),
 
-       url('iconfont.ttf?t=1635728227466') format('truetype');
 
+  font-family: "iconfont"; /* Project id  */
 
+  src: url('iconfont.ttf?t=1680856804881') format('truetype');
 
 }
 
 
 .iconfont {
 
@@ -13,95 +11,27 @@
 
   -moz-osx-font-smoothing: grayscale;
 
 }
 
 
-.icon-kehuzijin:before {
 
-  content: "\e615";
 
+.icon-churukujilu:before {
 
+  content: "\e61e";
 
 }
 
 
-.icon-a-4-shougoubeifen:before {
 
-  content: "\e614";
 
+.icon-shezhi:before {
 
+  content: "\e892";
 
 }
 
 
-.icon-chukuguanlibeifen:before {
 
-  content: "\e613";
 
+.icon-kehu:before {
 
+  content: "\e804";
 
 }
 
 
-.icon-a-tongzhibeifen2:before {
 
-  content: "\e612";
 
-}
 
-
 
-.icon-kehuguanli:before {
 
-  content: "\e610";
 
-}
 
-
 
-.icon-caiwuguanli:before {
 
-  content: "\e60f";
 
-}
 
-
 
-.icon-shenhe:before {
 
-  content: "\e60e";
 
-}
 
-
 
-.icon-caigouguanli:before {
 
-  content: "\e60d";
 
-}
 
-
 
-.icon-xiaoshou2:before {
 
-  content: "\e60c";
 
-}
 
-
 
-.icon-tongjibaobiao:before {
 
-  content: "\e60b";
 
-}
 
-
 
-.icon-dui:before {
 
-  content: "\e641";
 
-}
 
-
 
-.icon-yiliangyiyun:before {
 
-  content: "\e60a";
 
-}
 
-
 
-.icon-lishi:before {
 
-  content: "\e605";
 
-}
 
-
 
-.icon-guanbi:before {
 
-  content: "\e6c9";
 
-}
 
-
 
-.icon-yanjing-zhengyan:before {
 
-  content: "\e63a";
 
-}
 
-
 
-.icon-yanjing-biyan:before {
 
-  content: "\e63b";
 
-}
 
-
 
-.icon-yunshu2:before {
 
-  content: "\e609";
 
-}
 
-
 
-.icon-hetongguanli:before {
 
+.icon-chuku:before {
 
   content: "\e601";
 
 }
 
 
-.icon-index-copy:before {
 
-  content: "\e602";
 
-}
 
-
 
-.icon-shouqi:before {
 
-  content: "\e603";
 
-}
 
-
 
-.icon-zhankai:before {
 
-  content: "\e604";
 
-}
 
-
 
-.icon-cangkubeifen:before {
 
+.icon-ruku:before {
 
   content: "\e606";
 
 }
 
 
-.icon-renwuguanli:before {
 
-  content: "\e607";
 
+.icon-feiyong:before {
 
+  content: "\e521";
 
 }

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 0 - 0
public/static/iconfont/iconfont.js


+ 28 - 147
public/static/iconfont/iconfont.json
Fájl Megtekintése 

@@ -1,170 +1,51 @@
 
 {
 
-  "id": "2554236",
 
-  "name": "易粮易运",
 
+  "id": "",
 
+  "name": "",
 
   "font_family": "iconfont",
 
   "css_prefix_text": "icon-",
 
   "description": "",
 
   "glyphs": [
 
     {
 
-      "icon_id": "25314150",
 
-      "name": "kehuzijin",
 
-      "font_class": "kehuzijin",
 
-      "unicode": "e615",
 
-      "unicode_decimal": 58901
 
+      "icon_id": "1614437",
 
+      "name": "出入库记录",
 
+      "font_class": "churukujilu",
 
+      "unicode": "e61e",
 
+      "unicode_decimal": 58910
 
     },
 
     {
 
-      "icon_id": "25314041",
 
-      "name": "shougou",
 
-      "font_class": "a-4-shougoubeifen",
 
-      "unicode": "e614",
 
-      "unicode_decimal": 58900
 
+      "icon_id": "2076270",
 
+      "name": "设置",
 
+      "font_class": "shezhi",
 
+      "unicode": "e892",
 
+      "unicode_decimal": 59538
 
     },
 
     {
 
-      "icon_id": "25314040",
 
-      "name": "chukuguanli备份",
 
-      "font_class": "chukuguanlibeifen",
 
-      "unicode": "e613",
 
-      "unicode_decimal": 58899
 
+      "icon_id": "2932841",
 
+      "name": "客户",
 
+      "font_class": "kehu",
 
+      "unicode": "e804",
 
+      "unicode_decimal": 59396
 
     },
 
     {
 
-      "icon_id": "23871028",
 
-      "name": "gongzuotongzi",
 
-      "font_class": "a-tongzhibeifen2",
 
-      "unicode": "e612",
 
-      "unicode_decimal": 58898
 
-    },
 
-    {
 
-      "icon_id": "23506223",
 
-      "name": "kehuguanli",
 
-      "font_class": "kehuguanli",
 
-      "unicode": "e610",
 
-      "unicode_decimal": 58896
 
-    },
 
-    {
 
-      "icon_id": "23506216",
 
-      "name": "caiwuguanli",
 
-      "font_class": "caiwuguanli",
 
-      "unicode": "e60f",
 
-      "unicode_decimal": 58895
 
-    },
 
-    {
 
-      "icon_id": "23506010",
 
-      "name": "shenhe",
 
-      "font_class": "shenhe",
 
-      "unicode": "e60e",
 
-      "unicode_decimal": 58894
 
-    },
 
-    {
 
-      "icon_id": "23506008",
 
-      "name": "caigouguanli",
 
-      "font_class": "caigouguanli",
 
-      "unicode": "e60d",
 
-      "unicode_decimal": 58893
 
-    },
 
-    {
 
-      "icon_id": "23506003",
 
-      "name": "xiaoshou2",
 
-      "font_class": "xiaoshou2",
 
-      "unicode": "e60c",
 
-      "unicode_decimal": 58892
 
-    },
 
-    {
 
-      "icon_id": "23505876",
 
-      "name": "tongjibaobiao",
 
-      "font_class": "tongjibaobiao",
 
-      "unicode": "e60b",
 
-      "unicode_decimal": 58891
 
-    },
 
-    {
 
-      "icon_id": "2367514",
 
-      "name": "对",
 
-      "font_class": "dui",
 
-      "unicode": "e641",
 
-      "unicode_decimal": 58945
 
-    },
 
-    {
 
-      "icon_id": "23328186",
 
-      "name": "易粮易运",
 
-      "font_class": "yiliangyiyun",
 
-      "unicode": "e60a",
 
-      "unicode_decimal": 58890
 
-    },
 
-    {
 
-      "icon_id": "22771488",
 
-      "name": "历史",
 
-      "font_class": "lishi",
 
-      "unicode": "e605",
 
-      "unicode_decimal": 58885
 
-    },
 
-    {
 
-      "icon_id": "17984171",
 
-      "name": "关  闭",
 
-      "font_class": "guanbi",
 
-      "unicode": "e6c9",
 
-      "unicode_decimal": 59081
 
-    },
 
-    {
 
-      "icon_id": "10715457",
 
-      "name": "眼睛-睁眼",
 
-      "font_class": "yanjing-zhengyan",
 
-      "unicode": "e63a",
 
-      "unicode_decimal": 58938
 
-    },
 
-    {
 
-      "icon_id": "10715460",
 
-      "name": "眼睛-闭眼",
 
-      "font_class": "yanjing-biyan",
 
-      "unicode": "e63b",
 
-      "unicode_decimal": 58939
 
-    },
 
-    {
 
-      "icon_id": "22711544",
 
-      "name": "yunshuguanli",
 
-      "font_class": "yunshu2",
 
-      "unicode": "e609",
 
-      "unicode_decimal": 58889
 
-    },
 
-    {
 
-      "icon_id": "22700427",
 
-      "name": "hetong",
 
-      "font_class": "hetongguanli",
 
+      "icon_id": "4464995",
 
+      "name": "出库",
 
+      "font_class": "chuku",
 
       "unicode": "e601",
 
       "unicode_decimal": 58881
 
     },
 
     {
 
-      "icon_id": "22700497",
 
-      "name": "index",
 
-      "font_class": "index-copy",
 
-      "unicode": "e602",
 
-      "unicode_decimal": 58882
 
-    },
 
-    {
 
-      "icon_id": "22700554",
 
-      "name": "shouqi",
 
-      "font_class": "shouqi",
 
-      "unicode": "e603",
 
-      "unicode_decimal": 58883
 
-    },
 
-    {
 
-      "icon_id": "22700576",
 
-      "name": "zhankai",
 
-      "font_class": "zhankai",
 
-      "unicode": "e604",
 
-      "unicode_decimal": 58884
 
-    },
 
-    {
 
-      "icon_id": "22700607",
 
-      "name": "cangku",
 
-      "font_class": "cangkubeifen",
 
+      "icon_id": "4465007",
 
+      "name": "入库",
 
+      "font_class": "ruku",
 
       "unicode": "e606",
 
       "unicode_decimal": 58886
 
     },
 
     {
 
-      "icon_id": "22700672",
 
-      "name": "renwuguanli",
 
-      "font_class": "renwuguanli",
 
-      "unicode": "e607",
 
-      "unicode_decimal": 58887
 
+      "icon_id": "11584983",
 
+      "name": "费用",
 
+      "font_class": "feiyong",
 
+      "unicode": "e521",
 
+      "unicode_decimal": 58657
 
     }
 
   ]
 
 }

BIN
public/static/iconfont/iconfont.ttf
Fájl Megtekintése


+ 11 - 0
src/App.vue
Fájl Megtekintése 

@@ -155,4 +155,15 @@ input[type='number'] {
 
 .flex-2{
 
   flex:2;
 
 }
 
+.row_top{
 
+  margin:10px 0;
 
+  display:flex;
 
+  align-items: center;
 
+}
 
+.row_top .el-input{
 
+ width:30% !important;
 
+}
 
+.row_top .el-date-editor--daterange.el-date-editor{
 
+ width:37% !important;
 
+}
 
 </style>

+ 2 - 1
src/api/V2/speedGoods.js
Fájl Megtekintése 

@@ -29,12 +29,13 @@ export const api_speedExpenseInfoList = `/speedExpenseInfo/selectInfo`
 
 export const api_speedExpenseInfoAdd = `/speedExpenseInfo/api/addInfo`
 
 export const api_speedExpenseInfoEdit = `/speedExpenseInfo/api/editInfo`
 
 export const api_speedExpenseInfoDel = `/speedExpenseInfo/api/deleteInfo`
 
+export const api_speedExpenseInfoTotal ='/speedExpenseInfo/selectExpenseTotal'
 
 
 // 记录
 
 export const api_speedWarehouseInOutInfoList = `/speedWarehouseInOutInfo/selectInfo`
 
 export const api_speedWarehouseInOutInfoDel = `/speedWarehouseInOutInfo/api/deleteInfo`
 
 export const api_speedWarehouseInOutInfoEdit = `/speedWarehouseInOutInfo/api/editInfo`
 
-export const api_speedWarehouseInOutInfoAdd = `/speedExpenseInfo/api/addInfo`
 
+export const api_speedWarehouseInOutInfoAdd = `/speedWarehouseInOutInfo/api/addInfo`
 
 export const api_makeZero = `/speedGoodsInfo/api/makeZero`
 
 export const api_selectInOutCount = `/speedWarehouseInOutInfo/selectInOutCount`
 
 export const api_speedCustomerInfo = `/speedCustomerInfo/getInfo`

+ 4 - 0
src/api/V2/warehouse/index.js
Fájl Megtekintése 

@@ -8,3 +8,7 @@ export const API_GET_INFO = '/speedWarehouseInOutInfo/selectInfo'
 
 export const API_GET_CUSTOMERINFO = '/speedCustomerInfo/getInfo'
 
 // 查看当天提交的条数
 
 export const API_GET_COUNT ='/speedWarehouseInOutInfo/selectInOutCount'
 
+// 设置手动编辑重量
 
+export const API_SET_WEIGHT ='/enabledInfo/api/setEnabledInfo'
 
+// 查看手动编辑重量
 
+export const API_GET_WEIGHT ='/enabledInfo/getEnabledInfo'

+ 9 - 6
src/components/WsUpload/index.vue
Fájl Megtekintése 

@@ -171,6 +171,11 @@ export default {
 
       type: Number,
 
       default: 50,
 
     },
 
+    clicknum: {
 
+      // 文件总数量限制
 
+      type: Number,
 
+      default: 0,
 
+    },
 
     sizeLimit: {
 
       // 文件大小限制
 
       type: Number,
 
@@ -191,12 +196,6 @@ export default {
 
       type: String,
 
       required: true,
 
     },
 
-    vesselId: {
 
-      // 船舶ID
 
-      type: String,
 
-      default: '',
 
-      required: false,
 
-    },
 
     tableName: {
 
       // 要保存的表的名字
 
       type: String,
 
@@ -265,6 +264,9 @@ export default {
 
     async thisAppendixIds(newV, oldV) {
 
       this.getDefaultFiles(newV)
 
     },
 
+    clicknum(newV, oldV) {
 
+      this.getDefaultFiles(this.appendixIds)
 
+    },
 
   },
 
   mounted() {
 
     this.getDefaultFiles(this.appendixIds)
 
@@ -591,6 +593,7 @@ export default {
 
         const oldAppendixIds = this.removeList.join()
 
         const newAppendixs = this.fileList
 
         const params = { newAppendixs, oldAppendixIds }
 
+        console.log(params)
 
         // if (newAppendixs)
 
         saveFiles(params)
 
           .toPromise()

+ 12 - 0
src/global.js
Fájl Megtekintése 

@@ -24,6 +24,18 @@ export default {
 
     //     return status+date.getFullYear()+(date.getMonth()+1>=10?date.getMonth()+1:'0'+(date.getMonth()+1))+(date.getDate()>10?date.getDate():date.getDate())+num
 
         
     // },
 
+    getDate(date){
 
+        if(date){
 
+            var myDate = new Date(date);
 
+        }else{
 
+            var myDate = new Date();
 
+        }
 
+        
+        var year=myDate.getFullYear();    //获取完整的年份(4位,1970-????)
 
+        var month=myDate.getMonth();       //获取当前月份(0-11,0代表1月)
 
+        var date=myDate.getDate(); 
+        return year+'-'+((month+1)>=10?(month+1):'0'+(month+1))+'-'+(date>=10?date:'0'+date)
 
+    },
 
     whetherWebSocket: function(type) {
 
         var that = this
 
         if ('WebSocket' in window) {

+ 0 - 1
src/main.js
Fájl Megtekintése 

@@ -38,7 +38,6 @@ import axios from 'axios';
 
 Vue.prototype.$axios = axios;
 
 import global from './global.js'
 
 Vue.prototype.global = global
 
-Vue.prototype.$global = global
 
 import ItemWrap from './components/item-wrap/item-wrap.vue'
 
 Vue.component('ItemWrap', ItemWrap)
 
 import Echart from './components/echart/index.vue'

+ 27 - 1
src/model/speedGoods.js
Fájl Megtekintése 

@@ -1,4 +1,29 @@
 
-import { api_speedGoodsList,api_speedGoodsAdd,api_speedPositionInfoList,api_speedPositionInfoAdd,api_speedCustomerInfoList ,api_speedCustomerInfoAdd,api_speedGoodsEdit,api_speedGoodsDel,api_speedPositionInfoEdit,api_speedPositionInfoDel,api_speedCustomerInfoEdit,api_speedCustomerInfoDel,api_speedExpenseInfoList,api_speedExpenseInfoAdd,api_speedExpenseInfoEdit,api_speedExpenseInfoDel,api_speedWarehouseInOutInfoList,api_speedWarehouseInOutInfoAdd,api_speedWarehouseInOutInfoEdit,api_speedWarehouseInOutInfoDel,api_makeZero,api_exportOrder,api_speedCustomerInfo,api_selectInOutCount} from '@/api/V2/speedGoods'
 
+import { 
+    api_speedGoodsList,
 
+    api_speedGoodsAdd,
 
+    api_speedPositionInfoList,
 
+    api_speedPositionInfoAdd,
 
+    api_speedCustomerInfoList,
 
+    api_speedCustomerInfoAdd,
 
+    api_speedGoodsEdit,
 
+    api_speedGoodsDel,
 
+    api_speedPositionInfoEdit,
 
+    api_speedPositionInfoDel,
 
+    api_speedCustomerInfoEdit,
 
+    api_speedCustomerInfoDel,
 
+    api_speedExpenseInfoList,
 
+    api_speedExpenseInfoAdd,
 
+    api_speedExpenseInfoEdit,
 
+    api_speedExpenseInfoDel,
 
+    api_speedWarehouseInOutInfoList,
 
+    api_speedWarehouseInOutInfoAdd,
 
+    api_speedWarehouseInOutInfoEdit,
 
+    api_speedWarehouseInOutInfoDel,
 
+    api_makeZero,api_exportOrder,
 
+    api_speedCustomerInfo,
 
+    api_selectInOutCount,
 
+    api_speedExpenseInfoTotal,
 
+} from '@/api/V2/speedGoods'
 
 import { errorCatcher, errorHandle, filter } from 'base-core-lib'
 
 import { appRx } from './defalutConfig/indexRx'
 
 
@@ -25,6 +50,7 @@ export const speedExpenseInfoList = appRx.get(api_speedExpenseInfoList, errorCat
 
 export const speedExpenseInfoAdd = appRx.post(api_speedExpenseInfoAdd, errorCatcher, errorHandle, filter)
 
 export const speedExpenseInfoEdit = appRx.post(api_speedExpenseInfoEdit, errorCatcher, errorHandle, filter)
 
 export const speedExpenseInfoDel = appRx.post(api_speedExpenseInfoDel, errorCatcher, errorHandle, filter)
 
+export const speedExpenseInfoTotal = appRx.get(api_speedExpenseInfoTotal, errorCatcher, errorHandle, filter)
 
 
 // 记录
 
 export const speedWarehouseInOutInfoList = appRx.get(api_speedWarehouseInOutInfoList, errorCatcher, errorHandle, filter)

+ 8 - 2
src/model/warehouse/index.js
Fájl Megtekintése 

@@ -5,7 +5,9 @@ import {
 
     API_POST_DELINFO,
 
     API_GET_INFO,
 
     API_GET_CUSTOMERINFO,
 
-    API_GET_COUNT
 
+    API_GET_COUNT,
 
+    API_SET_WEIGHT,
 
+    API_GET_WEIGHT
 
 } from '@/api/V2/warehouse'
 
 // 添加出入库
 
 export const addList = appRx.post(API_POST_ADDINFO, errorCatcher, errorHandle, filter)
 
@@ -16,4 +18,8 @@ export const getList = appRx.get(API_GET_INFO, errorCatcher, errorHandle, filter
 
 // 查看客户信息
 
 export const getcustomer = appRx.get(API_GET_CUSTOMERINFO, errorCatcher, errorHandle, filter)
 
 // 查当天提交的条数
 
-export const getcount = appRx.get(API_GET_COUNT, errorCatcher, errorHandle, filter)
 
+export const getcount = appRx.get(API_GET_COUNT, errorCatcher, errorHandle, filter)
 
+// 设置手动编辑重量
 
+export const setweight = appRx.post(API_SET_WEIGHT, errorCatcher, errorHandle, filter)
 
+// 查看手动编辑重量
 
+export const getweight = appRx.get(API_GET_WEIGHT, errorCatcher, errorHandle, filter)

+ 3 - 2
src/router/index.js
Fájl Megtekintése 

@@ -46,12 +46,12 @@ export const constantRoutes = [{
 
         path: '/',
 
         component: Layout,
 
         redirect: { name: 'warehousing' },
 
-        meta: { title: 'warehousing', icon: '-index-copy', showClick: true },
 
+        meta: { title: 'warehousing', icon: '-ruku', showClick: true },
 
         children: [{
 
             path: 'warehousing',
 
             component: () => page('warehousing'),
 
             name: 'warehousing',
 
-            meta: { title: 'warehousing', icon: '-index-copy', affix: true, auth: 'warehousingPage', _title: '入库' },
 
+            meta: { title: 'warehousing', icon: '-ruku', affix: true, auth: 'warehousingPage', _title: '入库' },
 
             hidden: true
 
         }]
 
     },
 
@@ -73,6 +73,7 @@ modulesFiles.keys().forEach((model_item, key) => {
 
     })
 
     // 需要根据用户角色动态加载的路由
 
 export const asyncRoutes = cofigRouter
 
+console.log(asyncRoutes)
 
 const createRouter = () =>
 
     new Router({
 
         // mode: 'history',

+ 22 - 6
src/store/modules/permission.js
Fájl Megtekintése 

@@ -20,13 +20,29 @@ function filterAsyncRoutes(routes, roles) {
 
     };
 
     if (currentRoute.meta && currentRoute.meta.module) {
 
       const routeModule = currentRoute.meta.module;
 
-      // console.log(roles)
 
-      if (roles.some(role => role.indexOf(routeModule) === 0)) {
 
-      if (Array.isArray(currentRoute.children) && currentRoute.children.length > 0) {
 
-        currentRoute.children = filterAsyncRoutes(currentRoute.children, roles);
 
-      }
 
-      res.push(currentRoute);
 
+      console.log(roles)
 
+      if(routeModule.indexOf(',')!=-1){
 
+        var routeModules=routeModule.split(',')
 
+        for (let i = 0; i < routeModules.length; i++) {
 
+          if(roles.some(role => role.indexOf(routeModules[i]) === 0)){
 
+            if(res.every((item)=>{return item.name!=currentRoute.name})){
 
+              if (Array.isArray(currentRoute.children) && currentRoute.children.length > 0) {
 
+                currentRoute.children = filterAsyncRoutes(currentRoute.children, roles);
 
+              }
 
+              res.push(currentRoute);
 
+            }
 
+          }
 
+          
+        }
 
+      }else{
 
+        if (roles.some(role => role.indexOf(routeModule) === 0)) {
 
+          if (Array.isArray(currentRoute.children) && currentRoute.children.length > 0) {
 
+            currentRoute.children = filterAsyncRoutes(currentRoute.children, roles);
 
+          }
 
+          res.push(currentRoute);
 
+        }
 
       }
 
+      
     } else {
 
       res.push(currentRoute);
 
     }

+ 3 - 3
src/store/modules/user.js
Fájl Megtekintése 

@@ -151,7 +151,7 @@ const actions = {
 
         localStorage.setItem('ws-pf_compDomainName', compDomainName)
 
         localStorage.setItem('ws-pf_organMonetaryValue', organizationMonetaryValue)
 
         dispatch('getUserInfo', { vesselBankFlag, compName })
 
-        dispatch('toSetShow', userId)
 
+        // dispatch('toSetShow', userId)
 
         setToken('Admin-Token')
 
         return data
 
     },
 
@@ -199,7 +199,7 @@ const actions = {
 
             organizationMonetaryValue
 
         )
 
         dispatch('getUserInfo', { vesselBankFlag, compName })
 
-        dispatch('toSetShow', userId)
 
+        // dispatch('toSetShow', userId)
 
         setToken('Admin-Token')
 
         return data
 
 
@@ -326,7 +326,7 @@ const actions = {
 
     },
 
     async changeVesslBank({ commit, dispatch, state }, showVal) {
 
         await updateShowInfo(showVal).toPromise()
 
-        dispatch('toSetShow', { userId: localStorage.getItem('ws-pf_userId') })
 
+        // dispatch('toSetShow', { userId: localStorage.getItem('ws-pf_userId') })
 
     },
 
     setAdminId({ commit }, adminId) {
 
         commit('SET_ADMINID', adminId)

+ 1 - 1
src/styles/custom-style.scss
Fájl Megtekintése 

@@ -831,7 +831,7 @@
 
 .el-submenu [class^='icon'] {
 
   vertical-align: middle;
 
   margin-right: 5px;
 
-  width: 24px;
 
+  // width: 24px;
 
   text-align: center;
 
   font-size: 18px;
 
 }

+ 0 - 1
src/utils/util.js
Fájl Megtekintése 

@@ -35,7 +35,6 @@ export const allRoles=()=>{
 
     }
 
   }
 
   return currectRole
 
-  console.log(roles)
 
 };
 
 /**
 
  * 动态插入js

+ 4 - 4
src/views/boundManagement/component/route.js
Fájl Megtekintése 

@@ -9,8 +9,8 @@ const outboundManagementRouter = {
 
     alwaysShow: true, // will always show the root menu
 
     meta: {
 
         title: 'outbound',
 
-        module: 'outbound',
 
-        icon: '-chukuguanlibeifen'
 
+        module: 'speedEdition.outWarehouseJsb',
 
+        icon: '-chuku'
 
     },
 
     children: [
 
     
@@ -22,9 +22,9 @@ const outboundManagementRouter = {
 
             name: 'outbound',
 
             meta: {
 
               shortcutEntrance: 'outbound',
 
-              module: 'outbound.acquisitionWeightOut.view',
 
+              module: 'speedEdition.outWarehouseJsb',
 
               permissicon: [],
 
-              keepAlive: true,
 
+              keepAlive: false,
 
               _title:'出库'
 
             },
 
             hidden: true

+ 218 - 75
src/views/boundManagement/outbound.vue
Fájl Megtekintése 

@@ -1,23 +1,19 @@
 
-
 
 <template>
 
   <div class="bg" id="index">
 
     <el-row class="row_top">
 
-      <el-col :span="12">
 
+      <el-col :span="10">
 
         &nbsp;
 
       </el-col>
 
-      <el-col :span="12" class="bg-right">
 
-        <el-button class="bg-bottom" type="primary" size="small" @click="save()">保存</el-button>
 
-        <el-button class="bg-bottom" type="primary" size="small" @click="add()">新增</el-button>
 
+      <el-col style="padding-right:1%;" :span="13" class="bg-right">
 
+        <el-button class="bg-bottom add" size="small" type="text"  @click="add()">新增</el-button>
 
+        <el-button style="border:1px solid #409eff;" class="bg-bottom" type="primary" size="small" @click="save()">保存</el-button>
 
+        
       </el-col>
 
-    </el-row>
 
-    <el-row class="row_top">
 
-      <el-col :span="8">
 
+      <el-col :span="1">
 
         &nbsp;
 
       </el-col>
 
-      <el-col :span="16" >
 
-        <div v-if="this.form.businessNo" style="margin:10px 0;font-weight:600;font-size:16px;">业务编号：{{this.form.businessNo}}</div>
 
-      </el-col> 
     </el-row>
 
+
 
     <div class="enterTextWrap">
 
       <div class="flex-1">
 
         <div class="weign">
 
@@ -31,26 +27,32 @@
 
       </div>
 
       <div class="flex-2 flex-justify-space-between">
 
         <div class="form">
 
-          <el-form ref="form" :model="form" label-position="left" label-width="120px">
 
-            <div class="form-title">称重信息
 
-              <el-checkbox v-model="checked">手动编辑重量</el-checkbox>
 
-            </div>
 
-            <el-form-item label="毛重（公斤）">
 
-              <el-input @input="grossWeightInput" :disabled="!checked" placeholder="输入毛重" v-model="form.grossWeight"></el-input>
 
-              <el-button @click="gain(0)" type="text">获取</el-button>
 
+          <el-form ref="form" :model="form" label-position="right" label-width="120px">
 
+            <el-form-item style="position:absolute;top:28px;" v-if="this.form.businessNo" class="form-title businessNo" label="业务编号：">
 
+              {{this.form.businessNo}}
 
+            </el-form-item>
 
+            <el-form-item  class="form-title" label="称重信息">
 
+                <el-checkbox v-hasPermission="`speedEdition.inWarehouseJsb.edit` " @change="checkedchange" v-model="checked">允许手动编辑重量</el-checkbox>
 
             </el-form-item>
 
-            <el-form-item label="皮重（公斤）">
 
-              <el-input @input="tareInput" :disabled="!checked" placeholder="输入皮重" v-model="form.tare"></el-input>
 
+            <el-form-item class="handEdit" label="皮重（公斤）">
 
+              <el-input @mousewheel.native.prevent type="number" @input="tareInput" :disabled="!checked" placeholder="输入皮重" v-model="form.tare"></el-input>
 
               <el-button @click="gain(1)" type="text">获取</el-button>
 
             </el-form-item>
 
+            <el-form-item class="handEdit" label="毛重（公斤）">
 
+              <el-input @mousewheel.native.prevent type="number" @input="grossWeightInput" :disabled="!checked" placeholder="输入毛重" v-model="form.grossWeight"></el-input>
 
+              <el-button @click="gain(0)" type="text">获取</el-button>
 
+            </el-form-item>
 
             <el-form-item label="净重（公斤）">
 
               <el-input disabled placeholder="自动计算" v-model="form.netWeight"></el-input>
 
             </el-form-item>
 
-            <div class="form-title">基本信息</div>
 
-            <el-form-item label="客户姓名">
 
-              <el-select @change="customerChange" allow-create filterable clearable placeholder="输入客户姓名" v-model="form.customerName" >
 
+            <el-form-item   class="form-title" label="基本信息">
 
+            </el-form-item>
 
+            <el-form-item class="handEdit kehu" label="客户姓名">
 
+              <el-select v-if="text=='手输'" ref="select" @change="customerChange" filterable clearable placeholder="输入客户姓名" v-model="form.customerName" >
 
                 <el-option v-for="item in customerOptions" :key="item.id" :label="item.customerName+'（'+item.customerPhone+')'" :value="item.customerName"></el-option>
 
               </el-select>
 
+              <el-input v-else placeholder="输入客户姓名" v-model="form.customerName"></el-input>
 
+              <el-button class="bg-bottom" type="primary" size="small" @click="textchange()">{{text}}</el-button>
 
             </el-form-item>
 
             <el-form-item label="车牌号">
 
               <el-input maxlength="8" placeholder="输入毛重车牌号" v-model="form.carNumber"></el-input>
 
@@ -60,45 +62,48 @@
 
                 <el-option v-for="item in positionOptions" :key="item.id" :label="item.positionNo" :value="item.id"></el-option>
 
               </el-select>
 
             </el-form-item>
 
-            <div class="form-title">定价信息</div>
 
+            <el-form-item   class="form-title" label="定价信息">
 
+            </el-form-item>
 
             <el-form-item label="单价（元/吨）">
 
-              <el-input @input="unitPriceInput" placeholder="输入单价" v-model="form.unitPrice"></el-input>
 
+              <el-input @mousewheel.native.prevent type="number" @input="unitPriceInput" placeholder="输入单价" v-model="form.unitPrice"></el-input>
 
             </el-form-item>
 
             <el-form-item label="粮款（元）">
 
-              <el-input placeholder="自动计算" v-model="form.grainFund"></el-input>
 
+              <el-input @mousewheel.native.prevent type="number" placeholder="自动计算" v-model="form.grainFund"></el-input>
 
             </el-form-item>
 
           </el-form>
 
         </div>
 
         <div class="form">
 
-          <el-form  ref="form" :model="form" label-position="left" label-width="120px">
 
+          <el-form  ref="form" :model="form" label-position="right" label-width="120px">
 
+            <el-form-item   class="form-title" label="质检信息">
 
+            </el-form-item>
 
             <el-form-item label="货名">
 
               <el-select filterable clearable placeholder="选择货名" v-model="form.goodsName" >
 
                 <el-option v-for="item in goodOptions" :key="item.id" :label="item.goodsName" :value="item.goodsName"></el-option>
 
               </el-select>
 
             </el-form-item>
 
             <el-form-item label="容重(克/升)">
 
-              <el-input placeholder="输入容重" v-model="form.bulkDensity"></el-input>
 
+              <el-input @mousewheel.native.prevent type="number" placeholder="输入容重" v-model="form.bulkDensity"></el-input>
 
             </el-form-item>
 
             <el-form-item label="水分（%）">
 
-              <el-input placeholder="输入水分占比" v-model="form.waterContent"></el-input>
 
+              <el-input @mousewheel.native.prevent type="number" placeholder="输入水分占比" v-model="form.waterContent"></el-input>
 
             </el-form-item>
 
             <el-form-item label="蛋白（%）">
 
-              <el-input placeholder="输入蛋白占比" v-model="form.protein"></el-input>
 
+              <el-input @mousewheel.native.prevent type="number" placeholder="输入蛋白占比" v-model="form.protein"></el-input>
 
             </el-form-item>
 
             <el-form-item label="杂质（%）">
 
-              <el-input placeholder="输入杂质占比" v-model="form.impurity"></el-input>
 
+              <el-input @mousewheel.native.prevent type="number" placeholder="输入杂质占比" v-model="form.impurity"></el-input>
 
             </el-form-item>
 
             <el-form-item label="霉变粒（%）">
 
-              <el-input placeholder="输入霉变粒占比" v-model="form.mildewGrain"></el-input>
 
+              <el-input @mousewheel.native.prevent type="number" placeholder="输入霉变粒占比" v-model="form.mildewGrain"></el-input>
 
             </el-form-item>
 
             <el-form-item label="热损伤（%）">
 
-              <el-input placeholder="输入热损伤占比" v-model="form.jiaorenli"></el-input>
 
+              <el-input @mousewheel.native.prevent type="number" placeholder="输入热损伤占比" v-model="form.jiaorenli"></el-input>
 
             </el-form-item>
 
             <el-form-item label="不完善粒（%）">
 
-              <el-input placeholder="输入不完善粒占比" v-model="form.imperfectGrain"></el-input>
 
+              <el-input @mousewheel.native.prevent type="number" placeholder="输入不完善粒占比" v-model="form.imperfectGrain"></el-input>
 
             </el-form-item>
 
             <el-form-item label="备注">
 
-              <el-input placeholder="输入备注，0-150个字" type="textarea" v-model="form.remark"></el-input>
 
+              <el-input :rows="4" placeholder="输入备注，0-150个字" type="textarea" v-model="form.remark"></el-input>
 
             </el-form-item>
 
           </el-form>
 
         </div>
 
@@ -109,12 +114,11 @@
 
         <el-col :span="12">
 
           <el-date-picker value-format='yyyy-MM-dd' v-model="value" type="daterange" unlink-panels range-separator="至"
 
               start-placeholder="开始日期" end-placeholder="结束日期" class="data_css" @change="changeDate" ></el-date-picker>
 
-          <el-button class="bg-bottom" type="primary" size="small" @click="returnsales()">全部</el-button>
 
+          <el-button class="bg-bottom" type="primary" size="small" @click="allinout()">全部</el-button>
 
         </el-col>
 
         <el-col :span="12" class="bg-right">
 
           <el-input placeholder="可按客户、车牌号查找" class="input_css" v-model="searchKeyWord"></el-input>
 
-          <el-button class="find" type="primary" @click="find()"><img width="16" height="16" style="left: -8px;"
 
-                src="../../../public/img/sousuo.png" alt="" /></el-button>
 
+          <el-button class="find" type="primary" @click="find()">查找</el-button>
 
         </el-col>
 
       </el-row>
 
       <el-table :data="tableData" stripe style="width: 100%">
 
@@ -130,7 +134,7 @@
 
               <span v-else>{{ scope.$index + 1 }}</span>
 
             </template>
 
         </el-table-column>
 
-        <el-table-column prop="createDate" label="日期"></el-table-column>
 
+        <el-table-column width="120" prop="businessNo" label="业务编号"></el-table-column>
 
         <el-table-column prop="positionNo" label="仓位"></el-table-column>
 
         <el-table-column prop="carNumber" label="车牌号"></el-table-column>
 
         <el-table-column prop="customerName" label="客户">
 
@@ -140,17 +144,21 @@
 
           </template>
 
         </el-table-column>
 
         <el-table-column width="120" prop="goodsName" label="货名"></el-table-column>
 
-        <el-table-column width="120" prop="grossWeight" label="毛重（吨）"></el-table-column>
 
-        <el-table-column width="120" prop="tare" label="皮重（吨）"></el-table-column>
 
-        <el-table-column width="120" prop="netWeight" label="净重（吨）"></el-table-column>
 
+        <el-table-column prop="grossWeight" label="毛重（吨）" show-overflow-tooltip>
 
+        </el-table-column>
 
+        <el-table-column prop="tare" label="皮重（吨）" show-overflow-tooltip>
 
+        </el-table-column>
 
+        <el-table-column prop="netWeight" label="净重（吨）" show-overflow-tooltip>
 
+        </el-table-column>
 
         <el-table-column width="120" prop="bulkDensity" label="容重（克/升）"></el-table-column>
 
         <el-table-column width="120" prop="waterContent" label="水分（%）"></el-table-column>
 
         <el-table-column width="120" prop="unitPrice" label="单价（元/吨）"></el-table-column>
 
         <el-table-column width="120" prop="grainFund" label="粮款（元）"></el-table-column>
 
+        <el-table-column width="200" prop="createDate" label="日期"></el-table-column>
 
         <el-table-column width="120" prop="status" label="付款状态"></el-table-column>
 
         <el-table-column prop="address" label="操作" width="200">
 
           <template slot-scope="scope">
 
-            <el-button @click="del(scope.row)" type="text">删除</el-button>
 
+            <el-button v-hasPermission="`speedEdition.inWarehouseJsb.delete` " @click="del(scope.row)" type="text">删除</el-button>
 
           </template>
 
         </el-table-column>
 
       </el-table>
 
@@ -163,6 +171,7 @@
 
       title="客户信息"
 
       :visible.sync="dialogVisible"
 
       width="30%"
 
+      :close-on-click-modal="false"
 
       :before-close="handleClose">
 
       <el-form ref="form" label-width="80px">
 
         <el-form-item label="姓名">
 
@@ -182,8 +191,7 @@
 
         </el-form-item>
 
       </el-form>
 
       <span slot="footer" class="dialog-footer">
 
-        <el-button @click="dialogVisible = false">取 消</el-button>
 
-        <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
 
+        <el-button @click="dialogVisible = false">关 闭</el-button>
 
       </span>
 
     </el-dialog>
 
   </div>
 
@@ -194,7 +202,9 @@ import {
 
   addList,
 
   delList,
 
   getList,
 
-  getcustomer
 
+  getcustomer,
 
+  setweight,
 
+  getweight
 
 } from '@/model/warehouse/index'
 
 import BalanceAlert from '@/components/balanceAlert'
 
 import {
 
@@ -213,10 +223,12 @@ export default {
 
     return {
 
       tableData:[],
 
       form:{
 
-        inOutFlag:2,
 
+        inOutFlag:1,
 
         compId:localStorage.getItem('ws-pf_compId'),
 
         goodsName:'玉米',
 
-        noFlag:'CK'
 
+        noFlag:'CK',
 
+        customerName:'',
 
+        grainFund:''
 
       },
 
       information:'',
 
       checked:false,
 
@@ -227,6 +239,7 @@ export default {
 
       customerOptions:[],
 
       startDate:'',
 
       endDate:'',
 
+      text:'手输',
 
       searchKeyWord:'',
 
       currentPage:1,
 
       pageSize:10,
 
@@ -249,9 +262,19 @@ export default {
 
     // var num=await global.default.getNum('RK')
 
     // console.log(num)
 
     // this.form.businessNo=num
 
+    const starttime = new Date();
 
+    starttime.setTime(starttime.getTime() - 3600 * 1000 * 24 * 30);
 
+    const end = global.default.getDate();
 
+    const start = global.default.getDate(starttime);
 
+    this.value=[start,end]
 
     speedPositionInfoList({compId:this.compId}).toPromise().then((res)=>{
 
       this.positionOptions=res
 
     })
 
+    var status=await getweight({compId:this.compId,functionType:4}).toPromise()
 
+    this.status=status?status:''
 
+    if(this.status&&this.status.value==1){
 
+      this.checked=true
 
+    }
 
     speedGoodsList({compId:this.compId}).toPromise().then((res)=>{
 
       if(res.length>0){
 
         for (let i = 0; i < res.length; i++) {
 
@@ -262,13 +285,7 @@ export default {
 
       }
 
       this.goodOptions=res
 
     })
 
-    speedCustomerInfoList({compId:this.compId,pageSize:1,currentPage:9999}).toPromise().then((res)=>{
 
-      if(res.records.length>0){
 
-        this.form.customerId=res.records[0].id
 
-        this.form.customerName=res.records[0].customerName
 
-      }
 
-      this.customerOptions=res.records
 
-    })
 
+    
     this.getList()
 
   },
 
   beforeDestroy() {
 
@@ -276,6 +293,43 @@ export default {
 
     
   },
 
   methods: {
 
+    checkedchange(e){
 
+      if(e) var value=1
 
+      else var value=0
 
+      if(this.status){
 
+        setweight({compId:this.compId,functionType:4,value:value,id:this.status.id}).toPromise().then((res)=>{
 
+          this.$message({
 
+            type: 'success',
 
+            message: '修改成功!'
 
+          });
 
+        })
 
+      }else{
 
+        setweight({compId:this.compId,functionType:4,value:value}).toPromise().then((res)=>{
 
+          this.$message({
 
+            type: 'success',
 
+            message: '修改成功!'
 
+          });
 
+        })
 
+      }
 
+      
+      console.log(e)
 
+      // setweight
 
+    },
 
+    allinout(){
 
+      this.value=[]
 
+      this.getList()
 
+    },
 
+    textchange(){
 
+      if(this.text=='手输'){
 
+        this.text='选择'
 
+      }else{
 
+        this.text='手输'
 
+      }
 
+      localStorage.setItem('outtextstatus',this.text)
 
+    },
 
+    find(){
 
+      this.getList()
 
+    },
 
     openPort() {
 
       this.$refs.weightChild.openPort()
 
     },
 
@@ -287,23 +341,30 @@ export default {
 
       }
 
       this.openPort()
 
     },
 
-    handleClose(){},
 
+    handleClose(){
 
+      this.dialogVisible=false
 
+    },
 
     radiochange1(row){
 
+      for(var i=0;i<this.tableData.length;i++){
 
+        this.tableData[i].select=false
 
+      }
 
       row.select=!row.select
 
-      this.form=row
 
+      this.form=JSON.parse(JSON.stringify(row))
 
     },
 
     radiochange(row){
 
       row.select=!row.select
 
       this.form={
 
-        inOutFlag:2,
 
+        inOutFlag:1,
 
         compId:localStorage.getItem('ws-pf_compId'),
 
         goodsName:'玉米',
 
-        noFlag:'CK'
 
+        noFlag:'CK',
 
+        customerName:'',
 
+        grainFund:''
 
       }
 
     },
 
     unitPriceInput(e){
 
       if(this.form.netWeight){
 
-        this.form.grainFund=e*this.form.netWeight
 
+        this.form.grainFund=Number(e*(this.form.netWeight/1000)).toFixed(3)
 
       }
 
     },
 
     async lookCustomerName(row){
 
@@ -326,9 +387,13 @@ export default {
 
       }
 
     },
 
     grossWeightInput(e){
 
-      if(this.form.tare) this.form.netWeight=e-this.form.tare
 
+      if(this.form.tare&&e) this.form.netWeight=e-this.form.tare
 
+      else this.form.netWeight=''
 
+    },
 
+    tareInput(e){
 
+      if(this.form.grossWeight&&e) this.form.netWeight=this.form.grossWeight-e
 
+      else this.form.netWeight=''
 
     },
 
-    tareInput(e){if(this.form.grossWeight) this.form.netWeight=this.form.grossWeight-e},
 
     changeDate(){
 
       if(this.value){
 
         this.startDate = this.value[0]
 
@@ -340,7 +405,28 @@ export default {
 
       this.getList()
 
     },
 
     getList(){
 
-      getList({compId:this.compId,startDate:this.startDate,endDate:this.endDate,pageSize:this.pageSize,currentPage:this.currentPage,searchType:1}).toPromise().then((res)=>{
 
+      if(localStorage.getItem('outtextstatus')){
 
+        this.text=localStorage.getItem('outtextstatus')
 
+      }
 
+      if(this.value){
 
+        this.startDate=this.value[0]
 
+        this.endDate=this.value[1]
 
+      }
 
+      speedCustomerInfoList({compId:this.compId,pageSize:9999,currentPage:1}).toPromise().then((res)=>{
 
+      // if(res.records.length>0){
 
+      //   this.form.customerId=res.records[0].id
 
+      //   this.form.customerName=res.records[0].customerName
 
+      // }
 
+      this.customerOptions=res.records
 
+    })
 
+      getList({compId:this.compId,
 
+        startDate:this.startDate,
 
+        endDate:this.endDate,
 
+        pageSize:this.pageSize,
 
+        currentPage:this.currentPage,
 
+        searchType:4,
 
+        searchKeyWord:this.searchKeyWord
 
+      }).toPromise().then((res)=>{
 
         if(res.records.length>0){
 
           for (let i = 0; i < res.records.length; i++) {
 
             res.records[i].select=false
 
@@ -359,10 +445,15 @@ export default {
 
     },
 
     add(){
 
       this.form={
 
-        inOutFlag:2,
 
+        inOutFlag:1,
 
         compId:localStorage.getItem('ws-pf_compId'),
 
         goodsName:'玉米',
 
-        noFlag:'CK'
 
+        noFlag:'CK',
 
+        customerName:'',
 
+        grainFund:''
 
+      }
 
+      for(var i=0;i<this.tableData.length;i++){
 
+        this.tableData[i].select=false
 
       }
 
     },
 
     save(){
 
@@ -371,73 +462,93 @@ export default {
 
           type: 'error',
 
           message: '毛重输入错误！'
 
         });
 
+        return
 
       }
 
       if(this.form.tare&&this.form.tare<0||typeof Number(this.form.tare) === 'Number'){
 
         this.$message({
 
           type: 'error',
 
           message: '皮重输入错误！'
 
         });
 
+        return
 
       }
 
       if(this.form.netWeight&&this.form.netWeight<0||typeof Number(this.form.netWeight) === 'Number'){
 
         this.$message({
 
           type: 'error',
 
           message: '净重输入错误！'
 
         });
 
+        return
 
       }
 
       if(this.form.unitPrice&&this.form.unitPrice<0||typeof Number(this.form.unitPrice) === 'Number'){
 
         this.$message({
 
           type: 'error',
 
           message: '单价输入错误！'
 
         });
 
+        return
 
       }
 
       if(this.form.grainFund&&this.form.grainFund<0||typeof Number(this.form.grainFund) === 'Number'){
 
         this.$message({
 
           type: 'error',
 
           message: '粮款输入错误！'
 
         });
 
+        return
 
       }
 
       if(this.form.bulkDensity&&this.form.bulkDensity<0||typeof Number(this.form.bulkDensity) === 'Number'){
 
         this.$message({
 
           type: 'error',
 
           message: '容重输入错误！'
 
         });
 
+        return
 
       }
 
       if(this.form.waterContent&&this.form.waterContent<0||typeof Number(this.form.waterContent) === 'Number'){
 
         this.$message({
 
           type: 'error',
 
           message: '水分输入错误！'
 
         });
 
+        return
 
       }
 
       if(this.form.protein&&this.form.protein<0||typeof Number(this.form.protein) === 'Number'){
 
         this.$message({
 
           type: 'error',
 
           message: '蛋白输入错误！'
 
         });
 
+        return
 
       }
 
       if(this.form.impurity&&this.form.impurity<0||typeof Number(this.form.impurity) === 'Number'){
 
         this.$message({
 
           type: 'error',
 
           message: '杂质输入错误！'
 
         });
 
+        return
 
       }
 
       if(this.form.mildewGrain&&this.form.mildewGrain<0||typeof Number(this.form.mildewGrain) === 'Number'){
 
         this.$message({
 
           type: 'error',
 
           message: '霉变粒输入错误！'
 
         });
 
+        return
 
       }
 
       if(this.form.jiaorenli&&this.form.jiaorenli<0||typeof Number(this.form.jiaorenli) === 'Number'){
 
         this.$message({
 
           type: 'error',
 
           message: '热损伤输入错误！'
 
         });
 
+        return
 
       }
 
       if(this.form.imperfectGrain&&this.form.imperfectGrain<0||typeof Number(this.form.imperfectGrain) === 'Number'){
 
         this.$message({
 
           type: 'error',
 
           message: '不完善粒输入错误！'
 
         });
 
+        return
 
       }
 
+      this.form.grossWeight=this.form.grossWeight?this.form.grossWeight/1000:null
 
+      this.form.tare=this.form.tare?this.form.tare/1000:null
 
+      this.form.netWeight=this.form.netWeight?this.form.netWeight/1000:null
 
+      this.$confirm('确定提交出库记录？', '提示', {
 
+          confirmButtonText: '确定',
 
+          cancelButtonText: '取消',
 
+          type: 'warning'
 
+        }).then(() => {
 
       addList(this.form).toPromise().then((res)=>{
 
         this.$message({
 
           type: 'success',
 
@@ -451,9 +562,10 @@ export default {
 
           message: req.message
 
         });          
       });
 
+      })
 
     },
 
     del(row){
 
-      this.$confirm('确定删除入库记录？', '提示', {
 
+      this.$confirm('确定删除出库记录？', '提示', {
 
           confirmButtonText: '确定',
 
           cancelButtonText: '取消',
 
           type: 'warning'
 
@@ -487,7 +599,6 @@ export default {
 
 };
 
 </script>
 
 <style lang="scss" scoped>
 
-
 
 .bg {
 
   width: 100%;
 
   height: 100%;
 
@@ -501,10 +612,7 @@ export default {
 
   display: flex;
 
   justify-content: space-between;
 
 }
 
-.form-title{
 
-  font-weight:600;
 
-  margin-bottom:10px;
 
-}
 
+
 
 .enterTextWrap .el-form .el-form-item__content .el-input,
 
 .enterTextWrap .el-form .el-form-item__content .el-select,
 
 /deep/.enterTextWrap .el-form .el-form-item__content .el-textarea .el-textarea__inner{
 
@@ -513,13 +621,48 @@ export default {
 
 /deep/.form .el-form .el-form-item .el-form-item__label{
 
   color:#8890b1;
 
 }
 
+/deep/.enterTextWrap  .el-form .form-title.el-form-item .el-form-item__label{
 
+  font-weight:600;
 
+  color:#000;
 
+  // margin-bottom:10px;
 
+}
 
+/deep/.enterTextWrap  .el-form .form-title.el-form-item.businessNo{
 
+  font-weight:600;
 
+  color:#000;
 
+}
 
 .form{
 
   flex:50%;
 
 }
 
-.row_top{
 
-  margin:10px 0;
 
+
 
+.enterTextWrap .el-form .handEdit .el-form-item__content  .el-input{
 
+  width:68%;
 
+}
 
+.enterTextWrap .el-form .handEdit .el-form-item__content  .el-select,
 
+.enterTextWrap .el-form .handEdit.kehu  .el-form-item__content .el-input{
 
+  width:61.5%;
 
+}
 
+.el-button{
 
+  margin-left:10px;
 
+}
 
+.el-button--text{
 
+  padding:0 10px !important;
 
+  margin-left:0px;
 
+}
 
+.find{
 
+  width:66px;
 
+  padding:0 20px;
 
+  position: relative;
 
+  // top:2px;
 
+}
 
+.el-form-item--small.el-form-item{
 
+  margin-bottom:10px;
 
+}
 
+.el-col.bg-right .add{
 
+  margin-left: 0 !important;
 
+  border:1px solid #409eff;
 
+  padding:9px 20px !important;
 
 }
 
-.row_top .el-input,.row_top .el-date-editor{
 
- width:50% !important;
 
+/deep/.el-textarea textarea{
 
+  padding: 2px 10px 0;
 
 }
 
 </style>

+ 4 - 4
src/views/cost/component/route.js
Fájl Megtekintése 

@@ -9,8 +9,8 @@ const record = {
 
     alwaysShow: true, // will always show the root menu
 
     meta: {
 
         title: '费用',
 
-        module: 'outbound',
 
-        icon: '-chukuguanlibeifen'
 
+        module: 'speedEdition.expenseJsb',
 
+        icon: '-feiyong'
 
     },
 
     children: [
 
         {
 
@@ -20,9 +20,9 @@ const record = {
 
             name: 'cost',
 
             meta: {
 
               shortcutEntrance: 'outbound',
 
-              module: 'outbound.acquisitionWeightOut.view',
 
+              module: 'speedEdition.expenseJsb',
 
               permissicon: [],
 
-              keepAlive: true,
 
+              keepAlive: false,
 
               _title:'费用'
 
             },
 
             hidden: true

+ 94 - 38
src/views/cost/cost.vue
Fájl Megtekintése 

@@ -1,29 +1,38 @@
 
 
 <template>
 
   <div class="bg" id="index">
 
-    <div class="row1">
 
+    <el-row class="row_top">
 
+      <el-col :span="12">
 
+        <el-date-picker class="daterange" @change="datechange" format="yyyy-MM-dd" v-model="value2" type="daterange" unlink-panels range-separator="至"
 
+        start-placeholder="开始日期" end-placeholder="结束日期">
 
+        </el-date-picker>
 
+        <span class="text">&nbsp;&nbsp;合计：收入{{ data.income }} - 支出{{ data.pay }}&nbsp;=&nbsp;差额{{ data.income-data.pay }}</span>
 
+      </el-col>
 
+      <el-col :span="12" class="bg-right">
 
+        <el-input :placeholder="'可按费用名称、备注内容查找'" clearable v-model="searchKeyWord" class="search_css"></el-input>
 
+        <el-button type="primary" size="small" @click="lookup" class="search">查找</el-button>
 
+      </el-col>
 
+    </el-row>
 
+    <!-- <div class="row1">
 
       <div class="left">
 
-        <el-date-picker @change="datechange" format="yyyy-MM-dd" v-model="value2" type="daterange" unlink-panels range-separator="至"
 
+        <el-date-picker class="daterange" @change="datechange" format="yyyy-MM-dd" v-model="value2" type="daterange" unlink-panels range-separator="至"
 
         start-placeholder="开始日期" end-placeholder="结束日期">
 
       </el-date-picker>
 
-
 
+      <span class="text">&nbsp;&nbsp;合计：收入{{ data.income }} - 支出{{ data.pay }}&nbsp;=&nbsp;利润{{ data.income-data.pay }}</span>
 
       </div>
 
       <div class="right">
 
         <el-input :placeholder="'可按费用名称、备注内容查找'" clearable v-model="searchKeyWord" class="search_css"></el-input>
 
         <el-button type="primary" size="small" @click="lookup" class="search">查找</el-button>
 
       </div>
 
-    </div>
 
+    </div> -->
 
     <div class="row2">
 
       <div class="left">
 
-        <el-button type="primary" size="small">全部</el-button>
 
-        <el-button type="primary" size="small">收入</el-button>
 
-        <el-button type="primary" size="small">支出</el-button>
 
-        <div>
 
-          <div class="text">合计：收入{{ 22 }} - 支出{{ 22 }}=利润{{ 0 }}</div>
 
-        </div>
 
+        <el-button @click="expensesTypeChange('')" :type="expensesType==''?'primary':''" size="small">全部</el-button>
 
+        <el-button @click="expensesTypeChange('收入')" :type="expensesType=='收入'?'primary':''" size="small">收入</el-button>
 
+        <el-button @click="expensesTypeChange('支出')" :type="expensesType=='支出'?'primary':''" size="small">支出</el-button>
 
       </div>
 
       <div class="right">
 
-        <el-button type="primary" size="small" @click="add()">添加</el-button>
 
+        <el-button v-hasPermission="`speedEdition.expenseJsb.add` " type="primary" size="small" @click="add()">添加</el-button>
 
       </div>
 
     </div>
 
     <el-table ref="singleTable" :data="tableData" highlight-current-row style="width: 100%" class="table">
 
@@ -58,29 +67,27 @@
 
           </span>
 
         </template>
 
       </el-table-column>
 
+      <el-table-column property="createDate" label="创建时间" width="150">
 
+      </el-table-column>
 
       <el-table-column prop="address" label="操作" show-overflow-tooltip>
 
         <template scope="scope">
 
-          <span style="color: #409EFF;margin-right:5px" @click="edit(scope.row)">编辑</span>
 
-          <span style="color: red;" @click="del(scope.row)">删除</span>
 
+          <span v-hasPermission="`speedEdition.expenseJsb.edit` " style="color: #409EFF;margin-right:5px" @click="edit(scope.row)">编辑</span>
 
+          <span v-hasPermission="`speedEdition.expenseJsb.delete` " style="color: red;" @click="del(scope.row)">删除</span>
 
         </template>
 
       </el-table-column>
 
     </el-table>
 
     <div style="text-align: center; padding: 10px">
 
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
 
-        :page-size="deptCircularPage.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
 
+        :page-size="deptCircularPage.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total">
 
       </el-pagination>
 
-      <WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
 
+      <WinseaContentModal :close-on-click-modal="false" v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
 
         @on-cancel="handleClose">
 
-        <div v-if="applstatus">
 
-          <ws-upload ref="upload" :size-limit="size" @onChange="onChange" :comp-id="compId" :appendix-ids="appendixIdss"
 
+          <ws-upload ref="upload1" :size-limit="size" @onChange="onChange1" :comp-id="compId" :appendix-ids="appendixIdss"
 
             accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .zip, .rar"
 
-            v-hasPermission="`contractManagement.buyContract.buyContractInfo.appl`" />
 
-        </div>
 
-        <ws-upload v-else ref="upload" :comp-id="compId" :appendix-ids="appendixIdss" :editable="false"
 
-          accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
 
+            />
 
       </WinseaContentModal>
 
       <!-- 新增编辑弹框 -->
 
-      <WinseaContentModal v-model="show" :title="title" @on-cancel="handleClose3" style="width:600px;left:0;right:0;margin:auto;">
 
+      <el-dialog :close-on-click-modal="false" width="600px" :title="title" :visible.sync="show" :append-to-body="true" @close="handleClose3">
 
         <el-form>
 
           <el-form-item label-width='100px' label="类型" span="1" prop="payee">
 
             <el-select v-model="dataObj.expensesType" placeholder="请选择"  style="width:100%">
 
@@ -101,15 +108,16 @@
 
             </el-input>
 
           </el-form-item>
 
 
-          <ws-upload style="margin-left:30px" ref="upload" table-name="maintain_work_order" oss-key="mainPlan"
 
-            :comp-id="compId" :appendix-ids="appendixIdsAdd" :vesselId="dataObj.addressUrl" :size-limit="size"
 
+          <ws-upload style="margin-left:100px" ref="upload" table-name="maintain_work_order" oss-key="mainPlan"
 
+            :comp-id="compId" :appendix-ids="appendixIdsAdd" :size-limit="size" :clicknum='clicknum'
 
+            :limit="9"
 
             @uploadSuccess="uploadSuccess" @onChange="onChange" accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
 
         </el-form>
 
         <div slot="footer" class="dialog-footer">
 
           <el-button @click="handleClose3">取 消</el-button>
 
           <el-button @click="submitdata">提交</el-button>
 
         </div>
 
-      </WinseaContentModal>
 
+      </el-dialog>
 
     </div>
 
   </div>
 
 </template>
 
@@ -120,12 +128,15 @@ import {
 
   speedExpenseInfoList,
 
   speedExpenseInfoAdd,
 
   speedExpenseInfoEdit,
 
-  speedExpenseInfoDel
 
+  speedExpenseInfoDel,
 
+  speedExpenseInfoTotal
 
 } from '@/model/speedGoods'
 
+import * as global from '@/global'
 
 import {
 
     dayjs,
 
     EventBus
 
   } from 'base-core-lib'
 
+// import { threadId } from 'worker_threads';
 
 export default {
 
   components: {
 
     WsUpload
 
@@ -134,6 +145,7 @@ export default {
 
     return {
 
       expensesType:'',
 
       formData:[],
 
+      total:0,
 
       dataObj:{
 
         expensesType:'支出',
 
         compId: localStorage.getItem('ws-pf_compId')
 
@@ -152,16 +164,17 @@ export default {
 
       show: false,
 
       compId: localStorage.getItem('ws-pf_compId'),
 
       appendixIdss: [],
 
+      clicknum:0,
 
       applstatus: false,
 
       accessoryTFs: false,
 
       deptCircularPage: {},
 
-      deptBudgetTotal: 0,
 
       currentPage: 1,
 
       pageSize: 10,
 
       id: '',
 
       tableData: [],
 
-      value2: '',
 
+      value2: [],
 
       searchKeyWord: '',
 
+      data:{},
 
       date: {
 
           year: dayjs().format('YYYY'),
 
           month: dayjs().format('MM'),
 
@@ -179,7 +192,11 @@ export default {
 
     this.getList()
 
   },
 
   mounted() {
 
-
 
+    const starttime = new Date();
 
+    starttime.setTime(starttime.getTime() - 3600 * 1000 * 24 * 365);
 
+    const end = global.default.getDate();
 
+    const start = global.default.getDate(starttime);
 
+    this.value2=[start,end]
 
 
   },
 
   beforeDestroy() {
 
@@ -187,6 +204,10 @@ export default {
 
 
   },
 
   methods: {
 
+    expensesTypeChange(status){
 
+      this.expensesType=status
 
+      this.getList()
 
+    },
 
     dateFormat(fmt, date) {
 
       let ret
 
       const opt = {
 
@@ -220,6 +241,11 @@ export default {
 
         this.getList()
 
     },
 
     getList(){
 
+      speedExpenseInfoTotal({startDate:this.startDate,
 
+        endDate:this.endDate,compId: localStorage.getItem('ws-pf_compId'),}).toPromise()
 
+        .then((response) => {
 
+          this.data=response
 
+        })
 
       speedExpenseInfoList({
 
         compId: localStorage.getItem('ws-pf_compId'),
 
         currentPage: this.currentPage,
 
@@ -239,6 +265,7 @@ export default {
 
             }
 
           }
 
           this.tableData = response.records
 
+          this.total=response.total
 
         })
 
     },
 
     submitdata() { 
@@ -247,24 +274,31 @@ export default {
 
         .toPromise()
 
         .then((response) => {
 
           console.log(response)
 
-          if(response=="ok"){
 
             this.$message.success('提交成功！')
 
             this.show = false
 
             this.getList()
 
-          }
 
+            this.dataObj={
 
+              expensesType:'支出',
 
+              compId: localStorage.getItem('ws-pf_compId')
 
+            }
 
+            this.$refs.upload.clearFiles()
 
         })
 
       }else{
 
         speedExpenseInfoEdit(this.dataObj)
 
         .toPromise()
 
         .then((response) => {
 
           console.log(response)
 
-          if(response=="ok"){
 
-            this.$message.success('提交成功！')
 
+            this.$message.success('编辑成功！')
 
             this.show = false
 
             this.getList()
 
-          }
 
+            this.dataObj={
 
+              expensesType:'支出',
 
+              compId: localStorage.getItem('ws-pf_compId')
 
+            }
 
+            this.$refs.upload.clearFiles()
 
         })
 
       }
 
+      
     },
 
     onChange(files) {
 
       this.fileNum = files
 
@@ -273,11 +307,29 @@ export default {
 
         console.log(files)
 
       })
 
     },
 
+    onChange1(files) {
 
+      this.fileNum = files
 
+      this.$refs.upload1.handleSaveBill().then((res) => {
 
+        this.dataObj.addressUrl = res
 
+        speedExpenseInfoEdit(this.dataObj)
 
+        .toPromise()
 
+        .then((response) => {
 
+          this.accessoryTFs=false
 
+          this.getList()
 
+        })
 
+        console.log(files)
 
+      })
 
+    },
 
     uploadSuccess(data, files, url) {
 
       console.log(data, files, url)
 
     },
 
     handleClose3() {
 
       this.show = false
 
+      this.dataObj={
 
+        expensesType:'支出',
 
+        compId: localStorage.getItem('ws-pf_compId')
 
+      }
 
+      this.$refs.upload.clearFiles()
 
     },
 
     handleClose() {
 
       // this.dialogViewSpareMoney = false
 
@@ -286,6 +338,7 @@ export default {
 
       this.id = row.id
 
       this.accessoryTFs = true
 
       this.appendixIdss = row.addressUrl
 
+      this.dataObj=row
 
       console.log(this.appendixIdss)
 
     },
 
     handleSizeChange(val) {
 
@@ -301,8 +354,9 @@ export default {
 
     edit(val) {
 
       this.title = '编辑'
 
       this.show = true
 
-      this.dataObj = val
 
-      this.appendixIdsAdd = val.addressUrl
 
+      this.clicknum++
 
+      this.dataObj = JSON.parse(JSON.stringify(val))
 
+      this.appendixIdsAdd = JSON.parse(JSON.stringify(val.addressUrl))
 
      },
 
     del(val) {
 
       this.$confirm('确定删除费用信息？', '提示', {
 
@@ -314,11 +368,9 @@ export default {
 
         .toPromise()
 
         .then((response) => {
 
           console.log(response)
 
-          if(response=="ok"){
 
             this.$message.success('删除成功！')
 
             this.show = false
 
             this.getList()
 
-          }
 
         })
 
       }).catch(() => {
 
         return false
 
@@ -328,6 +380,7 @@ export default {
 
       this.getList()
 
      },
 
     add() {
 
+      this.title='新增'
 
       this.show = true
 
     },
 
   },
 
@@ -378,5 +431,8 @@ export default {
 
 .search_css{
 
   width: 240px;
 
 }
 
+.daterange{
 
+  width:50% !important;
 
+}
 
 </style>

+ 4 - 4
src/views/customer/component/route.js
Fájl Megtekintése 

@@ -9,8 +9,8 @@ const record = {
 
     alwaysShow: true, // will always show the root menu
 
     meta: {
 
         title: '客户',
 
-        module: 'outbound',
 
-        icon: '-chukuguanlibeifen'
 
+        module: 'speedEdition.customerJsb',
 
+        icon: '-kehu'
 
     },
 
     children: [
 
         {
 
@@ -20,9 +20,9 @@ const record = {
 
             name: 'customer',
 
             meta: {
 
               shortcutEntrance: 'outbound',
 
-              module: 'outbound.acquisitionWeightOut.view',
 
+              module: 'speedEdition.customerJsb',
 
               permissicon: [],
 
-              keepAlive: true,
 
+              keepAlive: false,
 
               _title:'客户'
 
             },
 
             hidden: true

+ 25 - 18
src/views/customer/customer.vue
Fájl Megtekintése 

@@ -1,14 +1,23 @@
 
 <template>
 
   <div class="bg" id="index">
 
-    <div class="row1">
 
+    <el-row class="row_top">
 
+        <el-col :span="12">
 
+          <el-input style="width:300px;" :placeholder="'可按客户名、手机号查找'" clearable v-model="searchKeyWord" class="search_css"></el-input>
 
+        <el-button type="primary" size="small" @click="lookup" class="search">查找</el-button>
 
+        </el-col>
 
+        <el-col :span="12" class="bg-right">
 
+          <el-button  v-hasPermission="`speedEdition.customerJsb.add` " type="primary" size="small" @click="add()">添加</el-button>
 
+        </el-col>
 
+      </el-row>
 
+    <!-- <div class="row1">
 
       <div class="left">
 
-        <el-input :placeholder="'可按客户名、手机号查找'" clearable v-model="searchKeyWord" class="search_css"></el-input>
 
+        <el-input style="width:300px;" :placeholder="'可按客户名、手机号查找'" clearable v-model="searchKeyWord" class="search_css"></el-input>
 
         <el-button type="primary" size="small" @click="lookup" class="search">查找</el-button>
 
       </div>
 
       <div class="right">
 
-        <el-button type="primary" size="small" @click="add()">添加</el-button>
 
+        <el-button  v-hasPermission="`speedEdition.customerJsb.add` " type="primary" size="small" @click="add()">添加</el-button>
 
       </div>
 
-    </div>
 
+    </div> -->
 
     <el-table ref="singleTable" :data="speedCustomerInfoList" highlight-current-row style="width: 100%" class="table">
 
       <el-table-column type="index" width="50">
 
       </el-table-column>
 
@@ -24,8 +33,8 @@
 
       </el-table-column>
 
       <el-table-column prop="address" label="操作" show-overflow-tooltip>
 
         <template scope="scope">
 
-          <span style="color: #409EFF;margin-right:5px" @click="edit(scope.row)">编辑</span>
 
-          <span style="color: red;" @click="del(scope.row)">删除</span>
 
+          <span v-hasPermission="`speedEdition.customerJsb.edit` " style="color: #409EFF;margin-right:5px" @click="edit(scope.row)">编辑</span>
 
+          <span v-hasPermission="`speedEdition.customerJsb.delete` " style="color: red;" @click="del(scope.row)">删除</span>
 
         </template>
 
       </el-table-column>
 
     </el-table>
 
@@ -34,13 +43,13 @@
 
         :page-size="deptCircularPage.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
 
       </el-pagination>
 
     </div>
 
-    <el-dialog width="320px" :title="title" :visible.sync="isShowInventory" :append-to-body="true" :close="inventoryClose">
 
+    <el-dialog :close-on-click-modal="false" width="320px" :title="title" :visible.sync="isShowInventory" :append-to-body="true" :close="inventoryClose">
 
       <el-form class="customer" label-position="right" label-width="80px">
 
         <el-form-item class="customer-item" label="姓名">
 
           <el-input placeholder="请输入姓名" maxlength="100" size="small"  v-model="dataObj.customerName"/>
 
         </el-form-item>
 
         <el-form-item class="customer-item" label="手机号">
 
-          <el-input placeholder="请输入手机号" maxlength="100" size="small" v-model="dataObj.customerPhone"/>
 
+          <el-input placeholder="请输入手机号" maxlength="11" size="small" v-model="dataObj.customerPhone"/>
 
         </el-form-item>
 
         <el-form-item class="customer-item" label="银行卡号">
 
           <el-input placeholder="请输入银行卡号" maxlength="100" size="small"  v-model="dataObj.bankCard"/>
 
@@ -101,8 +110,8 @@ export default {
 
       speedCustomerInfoList({
 
         compId: localStorage.getItem('ws-pf_compId'),
 
         currentPage: this.currentPage,
 
-            pageSize: this.pageSize,
 
-            searchKeyWord: this.searchKeyWord,
 
+        pageSize: this.pageSize,
 
+        searchKeyWord: this.searchKeyWord,
 
       })
 
         .toPromise()
 
         .then((response) => {
 
@@ -121,7 +130,9 @@ export default {
 
       console.log(`当前页: ${val}`)
 
       this.getList()
 
     },
 
-    lookup() { },
 
+    lookup() {
 
+      this.getList()
 
+     },
 
     edit(val) {
 
       this.title="编辑"
 
       this.isShowInventory = true
 
@@ -136,11 +147,9 @@ export default {
 
         speedCustomerInfoDel({ id: val.id })
 
         .toPromise()
 
         .then((response) => {
 
-          if (response == "ok") {
 
               this.show = false
 
               this.$message.success('删除成功！')
 
               this.getList()
 
-            }
 
         })
 
       }).catch(() => {
 
         return false
 
@@ -161,7 +170,6 @@ export default {
 
         this.$message.error('手机号不能为空！')
 
         return
 
       }
 
-      debugger
 
       if(this.dataObj.customerPhone.length!=11){
 
         this.$message.error('手机号11位！')
 
         return
 
@@ -171,22 +179,21 @@ export default {
 
         .toPromise()
 
         .then((response) => {
 
           console.log(response)
 
-          if(response=="ok"){
 
             this.$message.success('提交成功！')
 
             this.isShowInventory = false
 
             this.getList()
 
-          }
 
         })
 
       }else{
 
         speedCustomerInfoEdit(this.dataObj)
 
         .toPromise()
 
         .then((response) => {
 
           console.log(response)
 
-          if(response=="ok"){
 
             this.$message.success('提交成功！')
 
             this.isShowInventory = false
 
+            this.dataObj={
 
+              compId: localStorage.getItem('ws-pf_compId')
 
+            },
 
             this.getList()
 
-          }
 
         })
 
       }

+ 4 - 4
src/views/record/component/route.js
Fájl Megtekintése 

@@ -9,8 +9,8 @@ const record = {
 
     alwaysShow: true, // will always show the root menu
 
     meta: {
 
         title: '记录',
 
-        module: 'outbound',
 
-        icon: '-chukuguanlibeifen'
 
+        module: 'speedEdition.inOutRecordJsb',
 
+        icon: '-churukujilu'
 
     },
 
     children: [
 
         {
 
@@ -20,9 +20,9 @@ const record = {
 
             name: 'record',
 
             meta: {
 
               shortcutEntrance: 'outbound',
 
-              module: 'outbound.acquisitionWeightOut.view',
 
+              module: 'speedEdition.inOutRecordJsb',
 
               permissicon: [],
 
-              keepAlive: true,
 
+              keepAlive: false,
 
               _title:'记录'
 
             },
 
             hidden: true

+ 176 - 64
src/views/record/record.vue
Fájl Megtekintése 

@@ -1,40 +1,40 @@
 
 
 <template>
 
   <div class="bg" id="index">
 
-    <div class="row1">
 
-      <div class="left">
 
-        <el-date-picker @change="datechange" format="yyyy-MM-dd" v-model="value2" type="daterange" unlink-panels
 
+    <el-row class="row_top">
 
+        <el-col :span="12"> 
+          <el-date-picker @change="datechange" format="yyyy-MM-dd" v-model="value2" type="daterange" unlink-panels
 
           range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
 
-        </el-date-picker>
 
-        <el-input :placeholder="'可按业务编号、车牌号、客户名查找'" clearable v-model="searchKeyWord" class="search_css"></el-input>
 
-        <el-button type="primary" size="small" @click="lookup" class="search">查找</el-button>
 
-      </div>
 
-      <div class="right">
 
-        <el-button type="primary" size="small" @click="batchPay(1)">批量收款</el-button>
 
-        <el-button type="primary" size="small" @click="batchPay(2)">批量付款</el-button>
 
-        <el-button type="primary" size="small" @click="exportExcel()">导出</el-button>
 
-        <el-button type="primary" size="small" @click="handlestatus(1)">盘亏</el-button>
 
-        <el-button type="primary" size="small" @click="handlestatus(2)">盘盈</el-button>
 
-      </div>
 
-    </div>
 
+          </el-date-picker>
 
+          <el-input style="width:40%;" :placeholder="'可按业务编号、车牌号、客户名、货名查找'" clearable v-model="searchKeyWord" class="search_css"></el-input>
 
+          <el-button type="primary" size="small" @click="lookup" class="search">查找</el-button>
 
+        </el-col>
 
+        <el-col style="text-align:right" :span="12">
 
+          <el-button v-hasPermission="`speedEdition.inOutRecordJsb.batch` " type="primary" size="small" @click="batchPay(1)">批量收款</el-button>
 
+          <el-button v-hasPermission="`speedEdition.inOutRecordJsb.batch` " type="primary" size="small" @click="batchPay(2)">批量付款</el-button>
 
+          <el-button v-hasPermission="`speedEdition.inOutRecordJsb.import` " type="primary" size="small" @click="exportExcel()">导出</el-button>
 
+          <el-button v-hasPermission="`speedEdition.inOutRecordJsb.tray`" type="primary" size="small" @click="handlestatus(1)">盘亏</el-button>
 
+          <el-button v-hasPermission="`speedEdition.inOutRecordJsb.tray`" type="primary" size="small" @click="handlestatus(2)">盘盈</el-button>
 
+        </el-col>
 
+    </el-row>
 
     <div class="row2">
 
       <div class="left">
 
-        <el-button type="primary" size="small" @click="search(0)">全部</el-button>
 
-        <el-button type="primary" size="small" @click="search(1)">入库记录</el-button>
 
-        <el-button type="primary" size="small" @click="search(2)">出库记录</el-button>
 
-        <el-button type="primary" size="small" @click="search('已付')">已付</el-button>
 
-        <el-button type="primary" size="small" @click="search('未付')">未付</el-button>
 
-        <el-button type="primary" size="small" @click="search('已收')">已收</el-button>
 
-        <el-button type="primary" size="small" @click="search('未收')">未收</el-button>
 
+        <el-button v-hasPermission="`speedEdition.inOutRecordJsb.status` " :type="searchType==''?'primary':''" size="small" @click="search(0)">全部</el-button>
 
+        <el-button v-hasPermission="`speedEdition.inOutRecordJsb.status` " :type="searchType==1?'primary':''" size="small" @click="search(1)">入库记录</el-button>
 
+        <el-button v-hasPermission="`speedEdition.inOutRecordJsb.status` " :type="searchType==2?'primary':''" size="small" @click="search(2)">出库记录</el-button>
 
+        <el-button v-hasPermission="`speedEdition.inOutRecordJsb.status` " :type="status=='已付'?'primary':''" size="small" @click="search('已付')">已付</el-button>
 
+        <el-button v-hasPermission="`speedEdition.inOutRecordJsb.status` " :type="status=='未付'?'primary':''" size="small" @click="search('未付')">未付</el-button>
 
+        <el-button v-hasPermission="`speedEdition.inOutRecordJsb.status` " :type="status=='已收'?'primary':''" size="small" @click="search('已收')">已收</el-button>
 
+        <el-button v-hasPermission="`speedEdition.inOutRecordJsb.status` " :type="status=='未收'?'primary':''" size="small" @click="search('未收')">未收</el-button>
 
       </div>
 
       <div class="right">
 
         <el-select v-model="value" placeholder="请选择" @change="changeGoodsName">
 
           <el-option v-for="item in goodsList" :key="item.id" :label="item.goodsName" :value="item.goodsName">
 
           </el-option>
 
         </el-select>
 
-        <div class="text">库存{{ goodsObj.storage }}吨</div>
 
-        <div class="text">加权成本{{ goodsObj.weightedCost }}元/吨</div>
 
-        <el-button type="primary" size="small" @click="zero()">归零</el-button>
 
+        <div class="text">合计【{{ storage }}】吨</div>
 
+        <div class="text">加权成本【{{ weightedCost }}】元/吨</div>
 
+        <el-button v-hasPermission="`speedEdition.inOutRecordJsb.zero`" type="primary" size="small" @click="zero()">计算</el-button>
 
       </div>
 
     </div>
 
     <div>
 
@@ -59,13 +59,12 @@
 
               {{ scope.row.customerName }}</div>
 
             <div v-else>{{ scope.row.customerName }}</div>
 
           </template>
 
-
 
         </el-table-column>
 
         <el-table-column prop="goodsName" label="货名" show-overflow-tooltip>
 
         </el-table-column>
 
         <el-table-column prop="grossWeight" label="毛重（吨）" show-overflow-tooltip>
 
         </el-table-column>
 
-        <el-table-column prop="trae" label="皮重（吨）" show-overflow-tooltip>
 
+        <el-table-column prop="tare" label="皮重（吨）" show-overflow-tooltip>
 
         </el-table-column>
 
         <el-table-column prop="netWeight" label="净重（吨）" show-overflow-tooltip>
 
         </el-table-column>
 
@@ -73,26 +72,34 @@
 
         </el-table-column>
 
         <el-table-column prop="waterContent" label="水分（%）" show-overflow-tooltip>
 
         </el-table-column>
 
-        <el-table-column prop="address" label="更多指标" show-overflow-tooltip>
 
+        <el-table-column prop="address" label="更多指标" >
 
           <template slot-scope="scope">
 
-            <div style="color:cornflowerblue">查看</div>
 
+            <div v-if="scope.row.carNumber!='盘盈'&&scope.row.carNumber!='盘亏'" @click="moreindicator(scope.row)" style="color:cornflowerblue">查看</div>
 
           </template>
 
         </el-table-column>
 
         <el-table-column prop="unitPrice" label="单价（元/吨）" width="100">
 
         </el-table-column>
 
         <el-table-column prop="grainFund" label="粮款（元）" show-overflow-tooltip>
 
         </el-table-column>
 
-        <el-table-column prop="address" label="备注" show-overflow-tooltip>
 
+        <el-table-column prop="address" label="备注" >
 
           <template slot-scope="scope">
 
-            <div style="color:cornflowerblue">查看</div>
 
+            <el-popover v-if="scope.row.remark"
 
+            placement="bottom"
 
+            title="备注"
 
+            width="200"
 
+            trigger="click"
 
+            :content="scope.row.remark">
 
+            <div slot="reference" style="color:cornflowerblue">查看</div>
 
+          </el-popover>
 
+            
           </template>
 
         </el-table-column>
 
         <el-table-column prop="createDate" label="日期" width="140">
 
         </el-table-column>
 
-        <el-table-column prop="status" label="收款状态" show-overflow-tooltip>
 
+        <el-table-column prop="status" label="收支状态" show-overflow-tooltip>
 
           <template slot-scope="scope">
 
-            <div style="display:flex;align-items: center">
 
-              <div style="color:cornflowerblue">{{ scope.row.status }}</div>
 
+            <div v-if="scope.row.carNumber!='盘盈'&&scope.row.carNumber!='盘亏'" style="display:flex;align-items: center">
 
+              <div >{{ scope.row.status }}</div>
 
               <img src="../../../public/img/change.png" alt="" width="18" height="20"
 
                 style="vertical-align: text-top; position: relative; top: -1px" @click="changeStatus(scope.row)">
 
             </div>
 
@@ -121,7 +128,7 @@
 
     </div>
 
     <div style="text-align: center; padding: 10px">
 
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
 
-        :page-size="deptCircularPage.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
 
+        :page-size="deptCircularPage.pageSize" :page-sizes="[10, 30, 50, 100, 500, 1000]" layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
 
       </el-pagination>
 
       <WinseaContentModal v-model="accessoryTFs" @on-cancel="handleClose">
 
         <div>
 
@@ -130,7 +137,32 @@
 
         </div>
 
       </WinseaContentModal>
 
     </div>
 
-    <el-dialog width="320px" title="客户信息" :visible.sync="isShowCustomer" :append-to-body="true" :close="customerclose">
 
+    <el-dialog :close-on-click-modal="false" width="320px" title="更多指标" :visible.sync="isShowindex" :append-to-body="true" :close="indexclose">
 
+      <el-form class="customer" label-position="right" label-width="120px">
 
+        <el-form-item class="customer-item" label="容重(克/升)">
 
+          <el-input disabled maxlength="100" size="small" v-model="goodindexObj.bulkDensity" />
 
+        </el-form-item>
 
+        <el-form-item class="customer-item" label="水分（%）">
 
+          <el-input disabled size="small" v-model="goodindexObj.waterContent" />
 
+        </el-form-item>
 
+        <el-form-item class="customer-item" label="蛋白（%）">
 
+          <el-input disabled v-model="goodindexObj.protein" size="small" />
 
+        </el-form-item>
 
+        <el-form-item class="customer-item" label="杂质（%）">
 
+          <el-input disabled v-model="goodindexObj.impurity" size="small" />
 
+        </el-form-item>
 
+        <el-form-item class="customer-item" label="霉变粒（%）">
 
+          <el-input disabled v-model="goodindexObj.mildewGrain" size="small" />
 
+        </el-form-item>
 
+        <el-form-item class="customer-item" label="热损伤（%）">
 
+          <el-input disabled v-model="goodindexObj.jiaorenli" size="small" />
 
+        </el-form-item>
 
+        <el-form-item class="customer-item" label="不完善粒（%）">
 
+          <el-input disabled v-model="goodindexObj.imperfectGrain" size="small" />
 
+        </el-form-item>
 
+      </el-form>
 
+    </el-dialog>
 
+    <el-dialog :close-on-click-modal="false" width="320px" title="客户信息" :visible.sync="isShowCustomer" :append-to-body="true" :close="customerclose">
 
       <el-form class="customer" label-position="right" label-width="120px">
 
         <el-form-item class="customer-item" label="姓名">
 
           <el-input disabled maxlength="100" size="small" v-model="customerObj.customerName" />
 
@@ -149,7 +181,7 @@
 
         </el-form-item>
 
       </el-form>
 
     </el-dialog>
 
-    <el-dialog width="320px" :title="inventoryTitle" :visible.sync="isShowInventory" :append-to-body="true"
 
+    <el-dialog width="320px" :close-on-click-modal="false" :title="inventoryTitle" :visible.sync="isShowInventory" :append-to-body="true"
 
       :close="inventoryClose">
 
       <el-form class="customer" label-position="right" label-width="120px">
 
         <el-form-item class="customer-item" label="货名">
 
@@ -171,7 +203,7 @@
 
         <el-form-item class="customer-item" label="货值（元）" v-if="inventoryTitle == '盘亏'">
 
           <el-input disabled placeholder="自动计算盘亏重量的货值" size="small" v-model="pSubmitObj.grainFund" />
 
         </el-form-item>
 
-        <el-form-item class="customer-item" label="盘亏重量（吨）" v-if="inventoryTitle == '盘盈'">
 
+        <el-form-item class="customer-item" label="盘盈重量（吨）" v-if="inventoryTitle == '盘盈'">
 
           <el-input placeholder="输入盘盈重量" maxlength="100" size="small" v-model="pSubmitObj.netWeight" @input="inputVal"
 
             type="number" />
 
         </el-form-item>
 
@@ -221,11 +253,15 @@ export default {
 
         goodsName: ''
 
       },
 
       goodsObj: {},
 
+      storage :'',
 
+      weightedCost:'',
 
       goodsObj1: {},
 
       date: {
 
         year: dayjs().format('YYYY'),
 
         month: dayjs().format('MM'),
 
       },
 
+      
+      searchType:'',
 
       startDate: '',
 
       endDate: '',
 
       inventoryTitle: '',
 
@@ -247,7 +283,9 @@ export default {
 
       value1: '',
 
       searchKeyWord: '',
 
       value2: '',
 
-      status: ''
 
+      status: '',
 
+      isShowindex:false,
 
+      goodindexObj:{}
 
     };
 
   },
 
   created() {
 
@@ -263,6 +301,10 @@ export default {
 
 
   },
 
   methods: {
 
+    moreindicator(row){
 
+      this.goodindexObj=row
 
+      this.isShowindex=true
 
+    },
 
     changeStatus(val) {
 
       if (val.status == '已付') {
 
         val.status = "未付"
 
@@ -277,8 +319,8 @@ export default {
 
       }
 
       speedWarehouseInOutInfoEdit(val).toPromise()
 
         .then((res) => {
 
-          if (res == "ok") {
 
-            this.$message.success('提交成功！')
 
+          if (res.toLowerCase() == "ok") {
 
+            this.$message.success('状态切换成功！')
 
             this.isShowInventory = false
 
           }
 
         })
 
@@ -291,11 +333,14 @@ export default {
 
     //盘亏盘盈
 
     async panSubmit() {
 
       this.pSubmitObj.compId = this.compId
 
-      if (this.pSubmitObj == '盘亏') {
 
+      if (this.inventoryTitle == '盘亏') {
 
         this.pSubmitObj.inOutFlag = 1
 
+        this.pSubmitObj.noFlag = 'PK'
 
       } else {
 
         this.pSubmitObj.inOutFlag = 2
 
+        this.pSubmitObj.noFlag = 'PY'
 
       }
 
+      
       // //查看编号
 
       // await selectInOutCount({
 
       //   compId: this.compId,
 
@@ -307,10 +352,12 @@ export default {
 
       // console.log(this.pSubmitObj)
 
       await speedWarehouseInOutInfoAdd(this.pSubmitObj).toPromise()
 
         .then((res) => {
 
-          if (res == "ok") {
 
-            this.$message.success('提交成功！')
 
-            this.isShowInventory = false
 
+          this.$message.success('提交成功！')
 
+          this.isShowInventory = false
 
+          this.pSubmitObj={
 
+            goodsName: ''
 
           }
 
+          this.getList()
 
         })
 
     },
 
     selectCustomer(val) {
 
@@ -346,6 +393,8 @@ export default {
 
       this.goodsObj = this.goodsList.filter((item) => {
 
         if (val == item.goodsName) return item
 
       })[0]
 
+      this.storage =''
 
+      this.weightedCost=''
 
       console.log(this.goodsObj)
 
     },
 
     changeGoodsName1(val) {
 
@@ -387,7 +436,7 @@ export default {
 
       }
 
       this.getList()
 
     },
 
-    getGoodSName() {
 
+    getGoodSName(status) {
 
       speedGoodsList({
 
         compId: localStorage.getItem('ws-pf_compId')
 
       })
 
@@ -396,10 +445,38 @@ export default {
 
           console.log(response)
 
           this.goodsList = response
 
           if (this.goodsList.length != 0) {
 
-            this.value = this.goodsList[0].goodsName
 
-            this.pSubmitObj.goodsName = this.goodsList[0].goodsName
 
-            this.goodsObj = this.goodsList[0]
 
-            this.goodsObj1 = this.goodsList[0]
 
+            for (let i = 0; i < response.length; i++) {
 
+                  if(response[i].setDefault!=0){
 
+                    this.pSubmitObj.goodsName=response[i].goodsName
 
+                    // this.goodsObj = response[i]
 
+                    // this.goodsObj1 = response[i]
 
+                  }
 
+                }
 
+            // this.pSubmitObj.goodsName = this.goodsList[0].goodsName
 
+            
+            if(!status){
 
+                for (let i = 0; i < response.length; i++) {
 
+                  if(response[i].setDefault!=0){
 
+                    this.value=response[i].goodsName
 
+                    this.goodsObj = response[i]
 
+                    this.goodsObj1 = response[i]
 
+                  }
 
+                }
 
+              // this.value = this.goodsList[0].goodsName
 
+              // this.goodsObj = this.goodsList[0]
 
+              // this.goodsObj1 = this.goodsList[0]
 
+            }else{
 
+              this.goodsObj = this.goodsList.filter((item) => {
 
+                if (this.value == item.goodsName) return item
 
+              })[0]
 
+              this.goodsObj1 = JSON.parse(JSON.stringify(this.goodsObj))
 
+            }
 
+            console.log(this.goodsObj)
 
+            if(status){
 
+              this.weightedCost=this.goodsObj.weightedCost
 
+            }else{
 
+              this.weightedCost=''
 
+            }
 
           }
 
         })
 
     },
 
@@ -450,14 +527,19 @@ export default {
 
         })
 
     },
 
     batchPay(val) {
 
+      if (this.multipleSelection.length==0) {
 
+            this.$message.error('暂未勾选条目！')
 
+            return
 
+        }
 
       let _flag = ''
 
       let _text = ""
 
       if (val == 1) {
 
         _text = '收款'
 
         _flag = 4
 
+        
         for (let i = 0; i < this.multipleSelection.length; i++) {
 
           if (this.multipleSelection[i].status == '已付' || this.multipleSelection[i].status == '未付'||this.multipleSelection[i].status == '已收') {
 
-            this.$message.error('存在已付或未付或已收项，请重新勾选！')
 
+            this.$message.error('请勾选待收款的出库条目！')
 
             return
 
           }
 
         }
 
@@ -466,7 +548,7 @@ export default {
 
         _flag = 3
 
         for (let i = 0; i < this.multipleSelection.length; i++) {
 
           if (this.multipleSelection[i].status == '已收' || this.multipleSelection[i].status == '未收'|| this.multipleSelection[i].status == '已付') {
 
-            this.$message.error('存在已收或未收或已付项，请重新勾选！')
 
+            this.$message.error('请勾选待付款的入库条目！')
 
             return
 
           }
 
         }
 
@@ -497,29 +579,54 @@ export default {
 
         cancelButtonText: '取消',
 
         type: 'warning'
 
       }).then(() => {
 
+        speedWarehouseInOutInfoDel({id:val.id}).toPromise().then(() => {
 
+          this.$message({
 
+              type: 'success',
 
+              message: '删除成功!'
 
+            });
 
+            this.getList()
 
+        })
 
       }).catch(() => {
 
         return false
 
       });
 
     },
 
     zero() {
 
-      this.$confirm('确定将【' + this.goodsObj.goodsName + '】的库存和成本归零？', '提示', {
 
-        confirmButtonText: '确定',
 
-        cancelButtonText: '取消',
 
-        type: 'warning'
 
-      }).then(() => {
 
+      if(this.multipleSelection.length==0){
 
+        this.$message.error('暂未勾选条目！')
 
+        return
 
+      }
 
+      var num=0
 
+      for(var i=0;i<this.multipleSelection.length;i++){
 
+        if(this.multipleSelection[i].inOutFlag==1){
 
+          this.$message.error('请勾选入库条目！')
 
+          return
 
+        }
 
+        if(this.multipleSelection[i].goodsName==this.goodsObj.goodsName&&this.multipleSelection[i].netWeight&&this.multipleSelection[i].grainFund){
 
+          num+=this.multipleSelection[i].netWeight
 
+        }
 
+      }
 
+      this.storage=num
 
+      // this.$confirm('确定将【' + this.goodsObj.goodsName + '】的库存和成本归零？', '提示', {
 
+      //   confirmButtonText: '确定',
 
+      //   cancelButtonText: '取消',
 
+      //   type: 'warning'
 
+      // }).then(() => {
 
         makeZero({
 
-          id: this.goodsObj.id
 
+          id: this.goodsObj.id,
 
+          speedWarehouseInOutInfoList:this.multipleSelection,
 
+          goodsName:this.value,
 
         }).toPromise()
 
           .then((response) => {
 
             this.$message({
 
               type: 'success',
 
               message: '操作成功!'
 
             });
 
-            this.getGoodSName()
 
+
 
+            this.getGoodSName(1)
 
           })
 
-      }).catch(() => {
 
-        return false
 
-      });
 
+      // }).catch(() => {
 
+      //   return false
 
+      // });
 
     },
 
     inventoryClose() {
 
       this.isShowInventory = false
 
@@ -537,6 +644,9 @@ export default {
 
     customerclose() {
 
       this.isShowCustomer = false
 
     },
 
+    indexclose(){
 
+      this.isShowindex = false
 
+    },
 
     // 查看客户
 
     customerClick(val) {
 
       this.isShowCustomer = true
 
@@ -577,7 +687,7 @@ export default {
 
     handleSizeChange(val) {
 
       console.log(`每页 ${val} 条`)
 
       this.pageSize = val
 
-      // this.getList()
 
+      this.getList()
 
     },
 
     handleCurrentChange(val) {
 
       this.currentPage = val
 
@@ -642,7 +752,9 @@ export default {
 
 .search_css {
 
   margin-left: 10px;
 
 }
 
-
 
+.el-row .el-col .search_css.el-input{
 
+  width:38% !important;
 
+}
 
 .table {
 
   margin-top: 20px;
 
 }

+ 6 - 6
src/views/setup/component/route.js
Fájl Megtekintése 

@@ -9,8 +9,8 @@ const setup = {
 
     alwaysShow: true, // will always show the root menu
 
     meta: {
 
       title: '设置',
 
-      module: 'customerMoneyManagement.customerMoney.view',
 
-      icon: '-kehuzijin'
 
+      module: 'speedEdition.goodsNameJsb,speedEdition.positionJsb',
 
+      icon: '-shezhi'
 
     },
 
     children: [
 
       {
 
@@ -21,9 +21,9 @@ const setup = {
 
         meta: {
 
           title: '货名设置',
 
           shortcutEntrance: 'customerFundList',
 
-          module: 'customerMoneyManagement.customerMoney.view',
 
+          module: 'speedEdition.goodsNameJsb',
 
           permissicon: [],
 
-          keepAlive: true,
 
+          keepAlive: false,
 
           _title:'货名设置'
 
         },
 
       },
 
@@ -35,9 +35,9 @@ const setup = {
 
         meta: {
 
           title: '仓位设置',
 
           shortcutEntrance: 'customerFundList',
 
-          module: 'customerMoneyManagement.customerMoney.view',
 
+          module: 'speedEdition.positionJsb',
 
           permissicon: [],
 
-          keepAlive: true,
 
+          keepAlive: false,
 
           _title:'仓位设置'
 
         },
 
       },

+ 13 - 8
src/views/setup/goodsSettings.vue
Fájl Megtekintése 

@@ -6,22 +6,22 @@
 
         <el-button type="primary" size="small" @click="add" class="add">添加</el-button>
 
       </div>
 
     </div>
 
-    <el-table ref="singleTable" :data="goodsList" highlight-current-row style="width: 100%" class="table">
 
+    <el-table ref="singleTable" :data="goodsList" highlight-current-row style="width: 100%;" class="table">
 
       <el-table-column type="index" width="50" label="序号">
 
       </el-table-column>
 
-      <el-table-column property="goodsName" label="货名" width="120">
 
+      <el-table-column property="goodsName" label="货名" width="200">
 
       </el-table-column>
 
-      <el-table-column property="storage" label="剩余库存（吨）" width="120">
 
+      <el-table-column property="storage" label="剩余库存（吨）" width="200">
 
       </el-table-column>
 
-      <el-table-column property="setDefault" label="默认货名">
 
+      <el-table-column property="setDefault" label="默认货名" width="200">
 
         <template scope="scope">
 
-          <el-checkbox v-model="scope.row.checked" @change="change($event,scope.row)">设为默认</el-checkbox>
 
+          <el-checkbox  v-hasPermission="`speedEdition.goodsNameJsb.default` " v-model="scope.row.checked" @change="change($event,scope.row)">设为默认</el-checkbox>
 
         </template>
 
       </el-table-column>
 
-      <el-table-column prop="address" label="操作" show-overflow-tooltip>
 
+      <el-table-column prop="address" label="操作"  show-overflow-tooltip>
 
         <template scope="scope">
 
-          <span style="color: #409EFF;margin-right:5px" @click="edit(scope.row)">编辑</span>
 
-          <span style="color: red;" @click="del(scope.row)">删除</span>
 
+          <!-- <span style="color: #409EFF;margin-right:5px" @click="edit(scope.row)">编辑</span> -->
 
+          <span  v-hasPermission="`speedEdition.goodsNameJsb.delete` " style="color: red;" @click="del(scope.row)">删除</span>
 
         </template>
 
       </el-table-column>
 
     </el-table>
 
@@ -90,6 +90,7 @@ export default {
 
       }else{
 
         val2.setDefault=0
 
       }
 
+      val2.flag=1
 
       speedGoodsEdit(val2)
 
           .toPromise()
 
           .then((response) => {
 
@@ -143,6 +144,10 @@ export default {
 
       this.show = true
 
     },
 
     del(val) {
 
+      if(val.storage&&val.storage>0){
 
+        this.$message.error('当前'+val.goodsName+'有剩余库存！')
 
+        return
 
+      }
 
       this.$confirm('确定删除货名？', '提示', {
 
         confirmButtonText: '确定',
 
         cancelButtonText: '取消',

+ 5 - 11
src/views/setup/warehouseSettings.vue
Fájl Megtekintése 

@@ -11,12 +11,12 @@
 
       </el-table-column>
 
       <el-table-column property="positionNo" label="仓位" width="120">
 
       </el-table-column>
 
-      <el-table-column property="storage" label="剩余库存（吨）" width="120">
 
-      </el-table-column>
 
+      <!-- <el-table-column property="storage" label="剩余库存（吨）" width="120">
 
+      </el-table-column> -->
 
       <el-table-column prop="address" label="操作" show-overflow-tooltip>
 
         <template scope="scope">
 
-          <span style="color: #409EFF;margin-right:5px" @click="edit(scope.row)">编辑</span>
 
-          <span style="color: red;" @click="del(scope.row)">删除</span>
 
+          <span v-hasPermission="`speedEdition.goodsNameJsb.edit` " style="color: #409EFF;margin-right:5px" @click="edit(scope.row)">编辑</span>
 
+          <span v-hasPermission="`speedEdition.goodsNameJsb.delete` " style="color: red;" @click="del(scope.row)">删除</span>
 
         </template>
 
       </el-table-column>
 
     </el-table>
 
@@ -81,22 +81,18 @@ export default {
 
         .toPromise()
 
         .then((response) => {debugger
 
           console.log(response)
 
-          if(response=='ok'){
 
             this.$message.success('提交成功！')
 
             this.show = false
 
             this.getList()
 
-          }
 
         })
 
       }else{
 
         speedPositionInfoEdit(this.dataObj)
 
         .toPromise()
 
         .then((response) => {debugger
 
           console.log(response)
 
-          if(response=='ok'){
 
-            this.$message.success('提交成功！')
 
+            this.$message.success('编辑成功！')
 
             this.show = false
 
             this.getList()
 
-          }
 
         })
 
       }
 
     },
 
@@ -131,11 +127,9 @@ export default {
 
       speedPositionInfoDel({ id: val.id })
 
         .toPromise()
 
         .then((response) => {
 
-          if (response == "ok") {
 
               this.show = false
 
               this.$message.success('删除成功！')
 
               this.getList()
 
-            }
 
         })
 
     }).catch(() => {
 
       return false

+ 215 - 77
src/views/warehousing/index.vue
Fájl Megtekintése 

@@ -1,23 +1,19 @@
 
-
 
 <template>
 
   <div class="bg" id="index">
 
     <el-row class="row_top">
 
-      <el-col :span="12">
 
+      <el-col :span="10">
 
         &nbsp;
 
       </el-col>
 
-      <el-col :span="12" class="bg-right">
 
-        <el-button class="bg-bottom" type="primary" size="small" @click="save()">保存</el-button>
 
-        <el-button class="bg-bottom" type="primary" size="small" @click="add()">新增</el-button>
 
+      <el-col style="padding-right:1%;" :span="13" class="bg-right">
 
+        <el-button class="bg-bottom add" size="small" type="text"  @click="add()">新增</el-button>
 
+        <el-button style="border:1px solid #409eff;" class="bg-bottom" type="primary" size="small" @click="save()">保存</el-button>
 
+        
       </el-col>
 
-    </el-row>
 
-    <el-row class="row_top">
 
-      <el-col :span="8">
 
+      <el-col :span="1">
 
         &nbsp;
 
       </el-col>
 
-      <el-col :span="16" >
 
-        <div v-if="this.form.businessNo" style="margin:10px 0;font-weight:600;font-size:16px;">业务编号：{{this.form.businessNo}}</div>
 
-      </el-col> 
     </el-row>
 
+
 
     <div class="enterTextWrap">
 
       <div class="flex-1">
 
         <div class="weign">
 
@@ -31,26 +27,32 @@
 
       </div>
 
       <div class="flex-2 flex-justify-space-between">
 
         <div class="form">
 
-          <el-form ref="form" :model="form" label-position="left" label-width="120px">
 
-            <div class="form-title">称重信息
 
-              <el-checkbox v-model="checked">手动编辑重量</el-checkbox>
 
-            </div>
 
-            <el-form-item label="毛重（公斤）">
 
-              <el-input @input="grossWeightInput" :disabled="!checked" placeholder="输入毛重" v-model="form.grossWeight"></el-input>
 
+          <el-form ref="form" :model="form" label-position="right" label-width="120px">
 
+            <el-form-item style="position:absolute;top:28px;"  v-if="this.form.businessNo" class="form-title businessNo" label="业务编号：">
 
+              {{this.form.businessNo}}
 
+            </el-form-item>
 
+            <el-form-item  class="form-title" label="称重信息">
 
+                <el-checkbox v-hasPermission="`speedEdition.inWarehouseJsb.edit` " @change="checkedchange" v-model="checked">允许手动编辑重量</el-checkbox>
 
+            </el-form-item>
 
+            <el-form-item class="handEdit" label="毛重（公斤）">
 
+              <el-input @mousewheel.native.prevent type="number" @input="grossWeightInput" :disabled="!checked" placeholder="输入毛重" v-model="form.grossWeight"></el-input>
 
               <el-button @click="gain(0)" type="text">获取</el-button>
 
             </el-form-item>
 
-            <el-form-item label="皮重（公斤）">
 
-              <el-input @input="tareInput" :disabled="!checked" placeholder="输入皮重" v-model="form.tare"></el-input>
 
+            <el-form-item class="handEdit" label="皮重（公斤）">
 
+              <el-input @mousewheel.native.prevent type="number" @input="tareInput" :disabled="!checked" placeholder="输入皮重" v-model="form.tare"></el-input>
 
               <el-button @click="gain(1)" type="text">获取</el-button>
 
             </el-form-item>
 
             <el-form-item label="净重（公斤）">
 
               <el-input disabled placeholder="自动计算" v-model="form.netWeight"></el-input>
 
             </el-form-item>
 
-            <div class="form-title">基本信息</div>
 
-            <el-form-item label="客户姓名">
 
-              <el-select @change="customerChange" allow-create filterable clearable placeholder="输入客户姓名" v-model="form.customerName" >
 
+            <el-form-item   class="form-title" label="基本信息">
 
+            </el-form-item>
 
+            <el-form-item class="handEdit kehu" label="客户姓名">
 
+              <el-select v-if="text=='手输'" ref="select" @change="customerChange" filterable clearable placeholder="输入客户姓名" v-model="form.customerName" >
 
                 <el-option v-for="item in customerOptions" :key="item.id" :label="item.customerName+'（'+item.customerPhone+')'" :value="item.customerName"></el-option>
 
               </el-select>
 
+              <el-input v-else placeholder="输入客户姓名" v-model="form.customerName"></el-input>
 
+              <el-button class="bg-bottom" type="primary" size="small" @click="textchange()">{{text}}</el-button>
 
             </el-form-item>
 
             <el-form-item label="车牌号">
 
               <el-input maxlength="8" placeholder="输入毛重车牌号" v-model="form.carNumber"></el-input>
 
@@ -60,45 +62,48 @@
 
                 <el-option v-for="item in positionOptions" :key="item.id" :label="item.positionNo" :value="item.id"></el-option>
 
               </el-select>
 
             </el-form-item>
 
-            <div class="form-title">定价信息</div>
 
+            <el-form-item   class="form-title" label="定价信息">
 
+            </el-form-item>
 
             <el-form-item label="单价（元/吨）">
 
-              <el-input @input="unitPriceInput" placeholder="输入单价" v-model="form.unitPrice"></el-input>
 
+              <el-input @mousewheel.native.prevent type="number" @input="unitPriceInput" placeholder="输入单价" v-model="form.unitPrice"></el-input>
 
             </el-form-item>
 
             <el-form-item label="粮款（元）">
 
-              <el-input placeholder="自动计算" v-model="form.grainFund"></el-input>
 
+              <el-input @mousewheel.native.prevent type="number" placeholder="自动计算" v-model="form.grainFund"></el-input>
 
             </el-form-item>
 
           </el-form>
 
         </div>
 
         <div class="form">
 
-          <el-form  ref="form" :model="form" label-position="left" label-width="120px">
 
+          <el-form  ref="form" :model="form" label-position="right" label-width="120px">
 
+            <el-form-item   class="form-title" label="质检信息">
 
+            </el-form-item>
 
             <el-form-item label="货名">
 
               <el-select filterable clearable placeholder="选择货名" v-model="form.goodsName" >
 
                 <el-option v-for="item in goodOptions" :key="item.id" :label="item.goodsName" :value="item.goodsName"></el-option>
 
               </el-select>
 
             </el-form-item>
 
             <el-form-item label="容重(克/升)">
 
-              <el-input placeholder="输入容重" v-model="form.bulkDensity"></el-input>
 
+              <el-input @mousewheel.native.prevent type="number" placeholder="输入容重" v-model="form.bulkDensity"></el-input>
 
             </el-form-item>
 
             <el-form-item label="水分（%）">
 
-              <el-input placeholder="输入水分占比" v-model="form.waterContent"></el-input>
 
+              <el-input @mousewheel.native.prevent type="number" placeholder="输入水分占比" v-model="form.waterContent"></el-input>
 
             </el-form-item>
 
             <el-form-item label="蛋白（%）">
 
-              <el-input placeholder="输入蛋白占比" v-model="form.protein"></el-input>
 
+              <el-input @mousewheel.native.prevent type="number" placeholder="输入蛋白占比" v-model="form.protein"></el-input>
 
             </el-form-item>
 
             <el-form-item label="杂质（%）">
 
-              <el-input placeholder="输入杂质占比" v-model="form.impurity"></el-input>
 
+              <el-input @mousewheel.native.prevent type="number" placeholder="输入杂质占比" v-model="form.impurity"></el-input>
 
             </el-form-item>
 
             <el-form-item label="霉变粒（%）">
 
-              <el-input placeholder="输入霉变粒占比" v-model="form.mildewGrain"></el-input>
 
+              <el-input @mousewheel.native.prevent type="number" placeholder="输入霉变粒占比" v-model="form.mildewGrain"></el-input>
 
             </el-form-item>
 
             <el-form-item label="热损伤（%）">
 
-              <el-input placeholder="输入热损伤占比" v-model="form.jiaorenli"></el-input>
 
+              <el-input @mousewheel.native.prevent type="number" placeholder="输入热损伤占比" v-model="form.jiaorenli"></el-input>
 
             </el-form-item>
 
             <el-form-item label="不完善粒（%）">
 
-              <el-input placeholder="输入不完善粒占比" v-model="form.imperfectGrain"></el-input>
 
+              <el-input @mousewheel.native.prevent type="number" placeholder="输入不完善粒占比" v-model="form.imperfectGrain"></el-input>
 
             </el-form-item>
 
             <el-form-item label="备注">
 
-              <el-input placeholder="输入备注，0-150个字" type="textarea" v-model="form.remark"></el-input>
 
+              <el-input :rows="4" placeholder="输入备注，0-150个字" type="textarea" v-model="form.remark"></el-input>
 
             </el-form-item>
 
           </el-form>
 
         </div>
 
@@ -109,12 +114,11 @@
 
         <el-col :span="12">
 
           <el-date-picker value-format='yyyy-MM-dd' v-model="value" type="daterange" unlink-panels range-separator="至"
 
               start-placeholder="开始日期" end-placeholder="结束日期" class="data_css" @change="changeDate" ></el-date-picker>
 
-          <el-button class="bg-bottom" type="primary" size="small" @click="returnsales()">全部</el-button>
 
+          <el-button class="bg-bottom" type="primary" size="small" @click="allinout()">全部</el-button>
 
         </el-col>
 
         <el-col :span="12" class="bg-right">
 
           <el-input placeholder="可按客户、车牌号查找" class="input_css" v-model="searchKeyWord"></el-input>
 
-          <el-button class="find" type="primary" @click="find()"><img width="16" height="16" style="left: -8px;"
 
-                src="../../../public/img/sousuo.png" alt="" /></el-button>
 
+          <el-button class="find" type="primary" @click="find()">查找</el-button>
 
         </el-col>
 
       </el-row>
 
       <el-table :data="tableData" stripe style="width: 100%">
 
@@ -130,7 +134,7 @@
 
               <span v-else>{{ scope.$index + 1 }}</span>
 
             </template>
 
         </el-table-column>
 
-        <el-table-column prop="createDate" label="日期"></el-table-column>
 
+        <el-table-column width="120" prop="businessNo" label="业务编号"></el-table-column>
 
         <el-table-column prop="positionNo" label="仓位"></el-table-column>
 
         <el-table-column prop="carNumber" label="车牌号"></el-table-column>
 
         <el-table-column prop="customerName" label="客户">
 
@@ -140,17 +144,21 @@
 
           </template>
 
         </el-table-column>
 
         <el-table-column width="120" prop="goodsName" label="货名"></el-table-column>
 
-        <el-table-column width="120" prop="grossWeight" label="毛重（吨）"></el-table-column>
 
-        <el-table-column width="120" prop="tare" label="皮重（吨）"></el-table-column>
 
-        <el-table-column width="120" prop="netWeight" label="净重（吨）"></el-table-column>
 
+        <el-table-column prop="grossWeight" label="毛重（吨）" show-overflow-tooltip>
 
+        </el-table-column>
 
+        <el-table-column prop="tare" label="皮重（吨）" show-overflow-tooltip>
 
+        </el-table-column>
 
+        <el-table-column prop="netWeight" label="净重（吨）" show-overflow-tooltip>
 
+        </el-table-column>
 
         <el-table-column width="120" prop="bulkDensity" label="容重（克/升）"></el-table-column>
 
         <el-table-column width="120" prop="waterContent" label="水分（%）"></el-table-column>
 
         <el-table-column width="120" prop="unitPrice" label="单价（元/吨）"></el-table-column>
 
         <el-table-column width="120" prop="grainFund" label="粮款（元）"></el-table-column>
 
+        <el-table-column width="200" prop="createDate" label="日期"></el-table-column>
 
         <el-table-column width="120" prop="status" label="付款状态"></el-table-column>
 
         <el-table-column prop="address" label="操作" width="200">
 
           <template slot-scope="scope">
 
-            <el-button @click="del(scope.row)" type="text">删除</el-button>
 
+            <el-button v-hasPermission="`speedEdition.inWarehouseJsb.delete` " @click="del(scope.row)" type="text">删除</el-button>
 
           </template>
 
         </el-table-column>
 
       </el-table>
 
@@ -163,6 +171,7 @@
 
       title="客户信息"
 
       :visible.sync="dialogVisible"
 
       width="30%"
 
+      :close-on-click-modal="false"
 
       :before-close="handleClose">
 
       <el-form ref="form" label-width="80px">
 
         <el-form-item label="姓名">
 
@@ -182,8 +191,7 @@
 
         </el-form-item>
 
       </el-form>
 
       <span slot="footer" class="dialog-footer">
 
-        <el-button @click="dialogVisible = false">取 消</el-button>
 
-        <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
 
+        <el-button @click="dialogVisible = false">关 闭</el-button>
 
       </span>
 
     </el-dialog>
 
   </div>
 
@@ -194,7 +202,9 @@ import {
 
   addList,
 
   delList,
 
   getList,
 
-  getcustomer
 
+  getcustomer,
 
+  setweight,
 
+  getweight
 
 } from '@/model/warehouse/index'
 
 import BalanceAlert from '@/components/balanceAlert'
 
 import {
 
@@ -213,10 +223,12 @@ export default {
 
     return {
 
       tableData:[],
 
       form:{
 
-        inOutFlag:1,
 
+        inOutFlag:2,
 
         compId:localStorage.getItem('ws-pf_compId'),
 
         goodsName:'玉米',
 
-        noFlag:'RK'
 
+        noFlag:'RK',
 
+        customerName:'',
 
+        grainFund:''
 
       },
 
       information:'',
 
       checked:false,
 
@@ -228,8 +240,10 @@ export default {
 
       startDate:'',
 
       endDate:'',
 
       searchKeyWord:'',
 
+      status:'',
 
       currentPage:1,
 
       pageSize:10,
 
+      text:'手输',
 
       value:[],
 
       deptBudgetTotal:0,
 
       dialogVisible:false,
 
@@ -244,17 +258,24 @@ export default {
 
   created() {
 
   },
 
   async mounted() {
 
-    // getList().toPromise()
 
-    const end = new Date();
 
-    const start = new Date();
 
-    start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
 
-    this.value=[start,]    
+    // getList().toPromise() 
+    const starttime = new Date();
 
+    starttime.setTime(starttime.getTime() - 3600 * 1000 * 24 * 30);
 
+    const end = global.default.getDate();
 
+    const start = global.default.getDate(starttime);
 
+    this.value=[start,end]
 
     // var num=await global.default.getNum('RK')
 
     // console.log(num)
 
     // this.form.businessNo=num
 
     speedPositionInfoList({compId:this.compId}).toPromise().then((res)=>{
 
       this.positionOptions=res
 
     })
 
+    var status=await getweight({compId:this.compId,functionType:4}).toPromise()
 
+    this.status=status?status:''
 
+    if(this.status&&this.status.value==1){
 
+      this.checked=true
 
+    }
 
+    console.log(status)
 
     speedGoodsList({compId:this.compId}).toPromise().then((res)=>{
 
       if(res.length>0){
 
         for (let i = 0; i < res.length; i++) {
 
@@ -265,13 +286,6 @@ export default {
 
       }
 
       this.goodOptions=res
 
     })
 
-    speedCustomerInfoList({compId:this.compId,pageSize:1,currentPage:9999}).toPromise().then((res)=>{
 
-      if(res.records.length>0){
 
-        this.form.customerId=res.records[0].id
 
-        this.form.customerName=res.records[0].customerName
 
-      }
 
-      this.customerOptions=res.records
 
-    })
 
     this.getList()
 
   },
 
   beforeDestroy() {
 
@@ -279,6 +293,43 @@ export default {
 
     
   },
 
   methods: {
 
+    checkedchange(e){
 
+      if(e) var value=1
 
+      else var value=0
 
+      if(this.status){
 
+        setweight({compId:this.compId,functionType:4,value:value,id:this.status.id}).toPromise().then((res)=>{
 
+          this.$message({
 
+            type: 'success',
 
+            message: '修改成功!'
 
+          });
 
+        })
 
+      }else{
 
+        setweight({compId:this.compId,functionType:4,value:value}).toPromise().then((res)=>{
 
+          this.$message({
 
+            type: 'success',
 
+            message: '修改成功!'
 
+          });
 
+        })
 
+      }
 
+      
+      console.log(e)
 
+      // setweight
 
+    },
 
+    allinout(){
 
+      this.value=[]
 
+      this.getList()
 
+    },
 
+    textchange(){
 
+      if(this.text=='手输'){
 
+        this.text='选择'
 
+      }else{
 
+        this.text='手输'
 
+      }
 
+      localStorage.setItem('inouttextstatus',this.text)
 
+    },
 
+    find(){
 
+      this.getList()
 
+    },
 
     openPort() {
 
       this.$refs.weightChild.openPort()
 
     },
 
@@ -290,23 +341,31 @@ export default {
 
       }
 
       this.openPort()
 
     },
 
-    handleClose(){},
 
+    handleClose(){
 
+      this.dialogVisible=false
 
+    },
 
     radiochange1(row){
 
+      for(var i=0;i<this.tableData.length;i++){
 
+        this.tableData[i].select=false
 
+      }
 
+      this.$forceUpdate()
 
       row.select=!row.select
 
-      this.form=row
 
+      this.form=JSON.parse(JSON.stringify(row))
 
     },
 
     radiochange(row){
 
       row.select=!row.select
 
       this.form={
 
-        inOutFlag:1,
 
+        inOutFlag:2,
 
         compId:localStorage.getItem('ws-pf_compId'),
 
         goodsName:'玉米',
 
-        noFlag:'RK'
 
+        noFlag:'RK',
 
+        customerName:'',
 
+        grainFund:''
 
       }
 
     },
 
     unitPriceInput(e){
 
       if(this.form.netWeight){
 
-        this.form.grainFund=e*this.form.netWeight
 
+        this.form.grainFund=Number(e*(this.form.netWeight/1000)).toFixed(3)
 
       }
 
     },
 
     async lookCustomerName(row){
 
@@ -329,9 +388,13 @@ export default {
 
       }
 
     },
 
     grossWeightInput(e){
 
-      if(this.form.tare) this.form.netWeight=e-this.form.tare
 
+      if(this.form.tare&&e) this.form.netWeight=e-this.form.tare
 
+      else this.form.netWeight=''
 
+    },
 
+    tareInput(e){
 
+      if(this.form.grossWeight&&e) this.form.netWeight=this.form.grossWeight-e
 
+      else this.form.netWeight=''
 
     },
 
-    tareInput(e){if(this.form.grossWeight) this.form.netWeight=this.form.grossWeight-e},
 
     changeDate(){
 
       if(this.value){
 
         this.startDate = this.value[0]
 
@@ -343,7 +406,28 @@ export default {
 
       this.getList()
 
     },
 
     getList(){
 
-      getList({compId:this.compId,startDate:this.startDate,endDate:this.endDate,pageSize:this.pageSize,currentPage:this.currentPage,searchType:2}).toPromise().then((res)=>{
 
+      if(localStorage.getItem('inouttextstatus')){
 
+        this.text=localStorage.getItem('inouttextstatus')
 
+      }
 
+      if(this.value){
 
+        this.startDate=this.value[0]
 
+        this.endDate=this.value[1]
 
+      }
 
+      speedCustomerInfoList({compId:this.compId,pageSize:9999,currentPage:1}).toPromise().then((res)=>{
 
+      // if(res.records.length>0){
 
+      //   this.form.customerId=res.records[0].id
 
+      //   this.form.customerName=res.records[0].customerName
 
+      // }
 
+      this.customerOptions=res.records
 
+    })
 
+      getList({compId:this.compId,
 
+        startDate:this.startDate,
 
+        endDate:this.endDate,
 
+        pageSize:this.pageSize,
 
+        currentPage:this.currentPage,
 
+        searchType:3,
 
+        searchKeyWord:this.searchKeyWord
 
+      }).toPromise().then((res)=>{
 
         if(res.records.length>0){
 
           for (let i = 0; i < res.records.length; i++) {
 
             res.records[i].select=false
 
@@ -362,10 +446,15 @@ export default {
 
     },
 
     add(){
 
       this.form={
 
-        inOutFlag:1,
 
+        inOutFlag:2,
 
         compId:localStorage.getItem('ws-pf_compId'),
 
         goodsName:'玉米',
 
-        noFlag:'RK'
 
+        noFlag:'RK',
 
+        customerName:'',
 
+        grainFund:''
 
+      }
 
+      for(var i=0;i<this.tableData.length;i++){
 
+        this.tableData[i].select=false
 
       }
 
     },
 
     save(){
 
@@ -374,73 +463,93 @@ export default {
 
           type: 'error',
 
           message: '毛重输入错误！'
 
         });
 
+        return
 
       }
 
       if(this.form.tare&&this.form.tare<0||typeof Number(this.form.tare) === 'Number'){
 
         this.$message({
 
           type: 'error',
 
           message: '皮重输入错误！'
 
         });
 
+        return
 
       }
 
       if(this.form.netWeight&&this.form.netWeight<0||typeof Number(this.form.netWeight) === 'Number'){
 
         this.$message({
 
           type: 'error',
 
           message: '净重输入错误！'
 
         });
 
+        return
 
       }
 
       if(this.form.unitPrice&&this.form.unitPrice<0||typeof Number(this.form.unitPrice) === 'Number'){
 
         this.$message({
 
           type: 'error',
 
           message: '单价输入错误！'
 
         });
 
+        return
 
       }
 
       if(this.form.grainFund&&this.form.grainFund<0||typeof Number(this.form.grainFund) === 'Number'){
 
         this.$message({
 
           type: 'error',
 
           message: '粮款输入错误！'
 
         });
 
+        return
 
       }
 
       if(this.form.bulkDensity&&this.form.bulkDensity<0||typeof Number(this.form.bulkDensity) === 'Number'){
 
         this.$message({
 
           type: 'error',
 
           message: '容重输入错误！'
 
         });
 
+        return
 
       }
 
       if(this.form.waterContent&&this.form.waterContent<0||typeof Number(this.form.waterContent) === 'Number'){
 
         this.$message({
 
           type: 'error',
 
           message: '水分输入错误！'
 
         });
 
+        return
 
       }
 
       if(this.form.protein&&this.form.protein<0||typeof Number(this.form.protein) === 'Number'){
 
         this.$message({
 
           type: 'error',
 
           message: '蛋白输入错误！'
 
         });
 
+        return
 
       }
 
       if(this.form.impurity&&this.form.impurity<0||typeof Number(this.form.impurity) === 'Number'){
 
         this.$message({
 
           type: 'error',
 
           message: '杂质输入错误！'
 
         });
 
+        return
 
       }
 
       if(this.form.mildewGrain&&this.form.mildewGrain<0||typeof Number(this.form.mildewGrain) === 'Number'){
 
         this.$message({
 
           type: 'error',
 
           message: '霉变粒输入错误！'
 
         });
 
+        return
 
       }
 
       if(this.form.jiaorenli&&this.form.jiaorenli<0||typeof Number(this.form.jiaorenli) === 'Number'){
 
         this.$message({
 
           type: 'error',
 
           message: '热损伤输入错误！'
 
         });
 
+        return
 
       }
 
       if(this.form.imperfectGrain&&this.form.imperfectGrain<0||typeof Number(this.form.imperfectGrain) === 'Number'){
 
         this.$message({
 
           type: 'error',
 
           message: '不完善粒输入错误！'
 
         });
 
+        return
 
       }
 
+      this.form.grossWeight=this.form.grossWeight?this.form.grossWeight/1000:null
 
+      this.form.tare=this.form.tare?this.form.tare/1000:null
 
+      this.form.netWeight=this.form.netWeight?this.form.netWeight/1000:null
 
+      this.$confirm('确定提交入库记录？', '提示', {
 
+          confirmButtonText: '确定',
 
+          cancelButtonText: '取消',
 
+          type: 'warning'
 
+        }).then(() => {
 
       addList(this.form).toPromise().then((res)=>{
 
         this.$message({
 
           type: 'success',
 
@@ -454,6 +563,7 @@ export default {
 
           message: req.message
 
         });          
       });
 
+      })
 
     },
 
     del(row){
 
       this.$confirm('确定删除入库记录？', '提示', {
 
@@ -504,10 +614,7 @@ export default {
 
   display: flex;
 
   justify-content: space-between;
 
 }
 
-.form-title{
 
-  font-weight:600;
 
-  margin-bottom:10px;
 
-}
 
+
 
 .enterTextWrap .el-form .el-form-item__content .el-input,
 
 .enterTextWrap .el-form .el-form-item__content .el-select,
 
 /deep/.enterTextWrap .el-form .el-form-item__content .el-textarea .el-textarea__inner{
 
@@ -516,13 +623,44 @@ export default {
 
 /deep/.form .el-form .el-form-item .el-form-item__label{
 
   color:#8890b1;
 
 }
 
+/deep/.enterTextWrap  .el-form .form-title.el-form-item .el-form-item__label{
 
+  font-weight:600;
 
+  color:#000;
 
+  // margin-bottom:10px;
 
+}
 
 .form{
 
   flex:50%;
 
 }
 
-.row_top{
 
-  margin:10px 0;
 
+
 
+.enterTextWrap .el-form .handEdit .el-form-item__content  .el-input{
 
+  width:68%;
 
+}
 
+.enterTextWrap .el-form .handEdit .el-form-item__content  .el-select,
 
+.enterTextWrap .el-form .handEdit.kehu  .el-form-item__content .el-input{
 
+  width:61.5%;
 
+}
 
+.el-button{
 
+  margin-left:10px;
 
+}
 
+.el-button--text{
 
+  padding:0 10px !important;
 
+  margin-left:0px;
 
+}
 
+.find{
 
+  width:66px;
 
+  padding:0 20px;
 
+  position: relative;
 
+  // top:2px;
 
+}
 
+.el-form-item--small.el-form-item{
 
+  margin-bottom:10px;
 
+}
 
+.el-col.bg-right .add{
 
+  margin-left: 0 !important;
 
+  border:1px solid #409eff;
 
+  padding:9px 20px !important;
 
 }
 
-.row_top .el-input,.row_top .el-date-editor{
 
- width:50% !important;
 
+/deep/.el-textarea textarea{
 
+  padding: 2px 10px 0;
 
 }
 
 </style>

Nem az összes módosított fájl került megjelenítésre, mert túl sok fájl változott