前端 sdy

public/static/iconfont/demo_index.html

@@ -54,6 +54,24 @@
       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
           
+            <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>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe605;</span>
+                <div class="name">历史</div>
+                <div class="code-name">&amp;#xe605;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe6c9;</span>
                 <div class="name">关  闭</div>
@@ -132,9 +150,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1626864886667') format('woff2'),
-       url('iconfont.woff?t=1626864886667') format('woff'),
-       url('iconfont.ttf?t=1626864886667') format('truetype');
+  src: url('iconfont.woff2?t=1628140599980') format('woff2'),
+       url('iconfont.woff?t=1628140599980') format('woff'),
+       url('iconfont.ttf?t=1628140599980') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -160,6 +178,33 @@
       <div class="content font-class">
         <ul class="icon_lists dib-box">
           
+          <li class="dib">
+            <span class="icon iconfont icon-dui"></span>
+            <div class="name">
+              对
+            </div>
+            <div class="code-name">.icon-dui
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-yiliangyiyun"></span>
+            <div class="name">
+              易粮易运
+            </div>
+            <div class="code-name">.icon-yiliangyiyun
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-lishi"></span>
+            <div class="name">
+              历史
+            </div>
+            <div class="code-name">.icon-lishi
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-guanbi"></span>
             <div class="name">
@@ -277,6 +322,30 @@
       <div class="content symbol">
           <ul class="icon_lists dib-box">
           
+            <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>

public/static/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 2554236 */
-  src: url('iconfont.woff2?t=1626864886667') format('woff2'),
-       url('iconfont.woff?t=1626864886667') format('woff'),
-       url('iconfont.ttf?t=1626864886667') format('truetype');
+  src: url('iconfont.woff2?t=1628140599980') format('woff2'),
+       url('iconfont.woff?t=1628140599980') format('woff'),
+       url('iconfont.ttf?t=1628140599980') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,18 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-dui:before {
+  content: "\e641";
+}
+
+.icon-yiliangyiyun:before {
+  content: "\e60a";
+}
+
+.icon-lishi:before {
+  content: "\e605";
+}
+
 .icon-guanbi:before {
   content: "\e6c9";
 }

public/static/iconfont/iconfont.json

@@ -5,6 +5,27 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "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": "关  闭",

public/static/logo/demo.css

@@ -1,539 +0,0 @@
-/* Logo 字体 */
-@font-face {
-  font-family: "iconfont logo";
-  src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834');
-  src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834#iefix') format('embedded-opentype'),
-    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.woff?t=1545807318834') format('woff'),
-    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.ttf?t=1545807318834') format('truetype'),
-    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.svg?t=1545807318834#iconfont') format('svg');
-}
-
-.logo {
-  font-family: "iconfont logo";
-  font-size: 160px;
-  font-style: normal;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-/* tabs */
-.nav-tabs {
-  position: relative;
-}
-
-.nav-tabs .nav-more {
-  position: absolute;
-  right: 0;
-  bottom: 0;
-  height: 42px;
-  line-height: 42px;
-  color: #666;
-}
-
-#tabs {
-  border-bottom: 1px solid #eee;
-}
-
-#tabs li {
-  cursor: pointer;
-  width: 100px;
-  height: 40px;
-  line-height: 40px;
-  text-align: center;
-  font-size: 16px;
-  border-bottom: 2px solid transparent;
-  position: relative;
-  z-index: 1;
-  margin-bottom: -1px;
-  color: #666;
-}
-
-
-#tabs .active {
-  border-bottom-color: #f00;
-  color: #222;
-}
-
-.tab-container .content {
-  display: none;
-}
-
-/* 页面布局 */
-.main {
-  padding: 30px 100px;
-  width: 960px;
-  margin: 0 auto;
-}
-
-.main .logo {
-  color: #333;
-  text-align: left;
-  margin-bottom: 30px;
-  line-height: 1;
-  height: 110px;
-  margin-top: -50px;
-  overflow: hidden;
-  *zoom: 1;
-}
-
-.main .logo a {
-  font-size: 160px;
-  color: #333;
-}
-
-.helps {
-  margin-top: 40px;
-}
-
-.helps pre {
-  padding: 20px;
-  margin: 10px 0;
-  border: solid 1px #e7e1cd;
-  background-color: #fffdef;
-  overflow: auto;
-}
-
-.icon_lists {
-  width: 100% !important;
-  overflow: hidden;
-  *zoom: 1;
-}
-
-.icon_lists li {
-  width: 100px;
-  margin-bottom: 10px;
-  margin-right: 20px;
-  text-align: center;
-  list-style: none !important;
-  cursor: default;
-}
-
-.icon_lists li .code-name {
-  line-height: 1.2;
-}
-
-.icon_lists .icon {
-  display: block;
-  height: 100px;
-  line-height: 100px;
-  font-size: 42px;
-  margin: 10px auto;
-  color: #333;
-  -webkit-transition: font-size 0.25s linear, width 0.25s linear;
-  -moz-transition: font-size 0.25s linear, width 0.25s linear;
-  transition: font-size 0.25s linear, width 0.25s linear;
-}
-
-.icon_lists .icon:hover {
-  font-size: 100px;
-}
-
-.icon_lists .svg-icon {
-  /* 通过设置 font-size 来改变图标大小 */
-  width: 1em;
-  /* 图标和文字相邻时，垂直对齐 */
-  vertical-align: -0.15em;
-  /* 通过设置 color 来改变 SVG 的颜色/fill */
-  fill: currentColor;
-  /* path 和 stroke 溢出 viewBox 部分在 IE 下会显示
-      normalize.css 中也包含这行 */
-  overflow: hidden;
-}
-
-.icon_lists li .name,
-.icon_lists li .code-name {
-  color: #666;
-}
-
-/* markdown 样式 */
-.markdown {
-  color: #666;
-  font-size: 14px;
-  line-height: 1.8;
-}
-
-.highlight {
-  line-height: 1.5;
-}
-
-.markdown img {
-  vertical-align: middle;
-  max-width: 100%;
-}
-
-.markdown h1 {
-  color: #404040;
-  font-weight: 500;
-  line-height: 40px;
-  margin-bottom: 24px;
-}
-
-.markdown h2,
-.markdown h3,
-.markdown h4,
-.markdown h5,
-.markdown h6 {
-  color: #404040;
-  margin: 1.6em 0 0.6em 0;
-  font-weight: 500;
-  clear: both;
-}
-
-.markdown h1 {
-  font-size: 28px;
-}
-
-.markdown h2 {
-  font-size: 22px;
-}
-
-.markdown h3 {
-  font-size: 16px;
-}
-
-.markdown h4 {
-  font-size: 14px;
-}
-
-.markdown h5 {
-  font-size: 12px;
-}
-
-.markdown h6 {
-  font-size: 12px;
-}
-
-.markdown hr {
-  height: 1px;
-  border: 0;
-  background: #e9e9e9;
-  margin: 16px 0;
-  clear: both;
-}
-
-.markdown p {
-  margin: 1em 0;
-}
-
-.markdown>p,
-.markdown>blockquote,
-.markdown>.highlight,
-.markdown>ol,
-.markdown>ul {
-  width: 80%;
-}
-
-.markdown ul>li {
-  list-style: circle;
-}
-
-.markdown>ul li,
-.markdown blockquote ul>li {
-  margin-left: 20px;
-  padding-left: 4px;
-}
-
-.markdown>ul li p,
-.markdown>ol li p {
-  margin: 0.6em 0;
-}
-
-.markdown ol>li {
-  list-style: decimal;
-}
-
-.markdown>ol li,
-.markdown blockquote ol>li {
-  margin-left: 20px;
-  padding-left: 4px;
-}
-
-.markdown code {
-  margin: 0 3px;
-  padding: 0 5px;
-  background: #eee;
-  border-radius: 3px;
-}
-
-.markdown strong,
-.markdown b {
-  font-weight: 600;
-}
-
-.markdown>table {
-  border-collapse: collapse;
-  border-spacing: 0px;
-  empty-cells: show;
-  border: 1px solid #e9e9e9;
-  width: 95%;
-  margin-bottom: 24px;
-}
-
-.markdown>table th {
-  white-space: nowrap;
-  color: #333;
-  font-weight: 600;
-}
-
-.markdown>table th,
-.markdown>table td {
-  border: 1px solid #e9e9e9;
-  padding: 8px 16px;
-  text-align: left;
-}
-
-.markdown>table th {
-  background: #F7F7F7;
-}
-
-.markdown blockquote {
-  font-size: 90%;
-  color: #999;
-  border-left: 4px solid #e9e9e9;
-  padding-left: 0.8em;
-  margin: 1em 0;
-}
-
-.markdown blockquote p {
-  margin: 0;
-}
-
-.markdown .anchor {
-  opacity: 0;
-  transition: opacity 0.3s ease;
-  margin-left: 8px;
-}
-
-.markdown .waiting {
-  color: #ccc;
-}
-
-.markdown h1:hover .anchor,
-.markdown h2:hover .anchor,
-.markdown h3:hover .anchor,
-.markdown h4:hover .anchor,
-.markdown h5:hover .anchor,
-.markdown h6:hover .anchor {
-  opacity: 1;
-  display: inline-block;
-}
-
-.markdown>br,
-.markdown>p>br {
-  clear: both;
-}
-
-
-.hljs {
-  display: block;
-  background: white;
-  padding: 0.5em;
-  color: #333333;
-  overflow-x: auto;
-}
-
-.hljs-comment,
-.hljs-meta {
-  color: #969896;
-}
-
-.hljs-string,
-.hljs-variable,
-.hljs-template-variable,
-.hljs-strong,
-.hljs-emphasis,
-.hljs-quote {
-  color: #df5000;
-}
-
-.hljs-keyword,
-.hljs-selector-tag,
-.hljs-type {
-  color: #a71d5d;
-}
-
-.hljs-literal,
-.hljs-symbol,
-.hljs-bullet,
-.hljs-attribute {
-  color: #0086b3;
-}
-
-.hljs-section,
-.hljs-name {
-  color: #63a35c;
-}
-
-.hljs-tag {
-  color: #333333;
-}
-
-.hljs-title,
-.hljs-attr,
-.hljs-selector-id,
-.hljs-selector-class,
-.hljs-selector-attr,
-.hljs-selector-pseudo {
-  color: #795da3;
-}
-
-.hljs-addition {
-  color: #55a532;
-  background-color: #eaffea;
-}
-
-.hljs-deletion {
-  color: #bd2c00;
-  background-color: #ffecec;
-}
-
-.hljs-link {
-  text-decoration: underline;
-}
-
-/* 代码高亮 */
-/* PrismJS 1.15.0
-https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascript */
-/**
- * prism.js default theme for JavaScript, CSS and HTML
- * Based on dabblet (http://dabblet.com)
- * @author Lea Verou
- */
-code[class*="language-"],
-pre[class*="language-"] {
-  color: black;
-  background: none;
-  text-shadow: 0 1px white;
-  font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
-  text-align: left;
-  white-space: pre;
-  word-spacing: normal;
-  word-break: normal;
-  word-wrap: normal;
-  line-height: 1.5;
-
-  -moz-tab-size: 4;
-  -o-tab-size: 4;
-  tab-size: 4;
-
-  -webkit-hyphens: none;
-  -moz-hyphens: none;
-  -ms-hyphens: none;
-  hyphens: none;
-}
-
-pre[class*="language-"]::-moz-selection,
-pre[class*="language-"] ::-moz-selection,
-code[class*="language-"]::-moz-selection,
-code[class*="language-"] ::-moz-selection {
-  text-shadow: none;
-  background: #b3d4fc;
-}
-
-pre[class*="language-"]::selection,
-pre[class*="language-"] ::selection,
-code[class*="language-"]::selection,
-code[class*="language-"] ::selection {
-  text-shadow: none;
-  background: #b3d4fc;
-}
-
-@media print {
-
-  code[class*="language-"],
-  pre[class*="language-"] {
-    text-shadow: none;
-  }
-}
-
-/* Code blocks */
-pre[class*="language-"] {
-  padding: 1em;
-  margin: .5em 0;
-  overflow: auto;
-}
-
-:not(pre)>code[class*="language-"],
-pre[class*="language-"] {
-  background: #f5f2f0;
-}
-
-/* Inline code */
-:not(pre)>code[class*="language-"] {
-  padding: .1em;
-  border-radius: .3em;
-  white-space: normal;
-}
-
-.token.comment,
-.token.prolog,
-.token.doctype,
-.token.cdata {
-  color: slategray;
-}
-
-.token.punctuation {
-  color: #999;
-}
-
-.namespace {
-  opacity: .7;
-}
-
-.token.property,
-.token.tag,
-.token.boolean,
-.token.number,
-.token.constant,
-.token.symbol,
-.token.deleted {
-  color: #905;
-}
-
-.token.selector,
-.token.attr-name,
-.token.string,
-.token.char,
-.token.builtin,
-.token.inserted {
-  color: #690;
-}
-
-.token.operator,
-.token.entity,
-.token.url,
-.language-css .token.string,
-.style .token.string {
-  color: #9a6e3a;
-  background: hsla(0, 0%, 100%, .5);
-}
-
-.token.atrule,
-.token.attr-value,
-.token.keyword {
-  color: #07a;
-}
-
-.token.function,
-.token.class-name {
-  color: #DD4A68;
-}
-
-.token.regex,
-.token.important,
-.token.variable {
-  color: #e90;
-}
-
-.token.important,
-.token.bold {
-  font-weight: bold;
-}
-
-.token.italic {
-  font-style: italic;
-}
-
-.token.entity {
-  cursor: help;
-}

public/static/logo/demo_index.html

@@ -1,207 +0,0 @@
-<!DOCTYPE html>
-<html>
-<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="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">
-  <script src="iconfont.js"></script>
-  <!-- jQuery -->
-  <script src="https://a1.alicdn.com/oss/uploads/2018/12/26/7bfddb60-08e8-11e9-9b04-53e73bb6408b.js"></script>
-  <!-- 代码高亮 -->
-  <script src="https://a1.alicdn.com/oss/uploads/2018/12/26/a3f714d0-08e6-11e9-8a15-ebf944d7534c.js"></script>
-  <style>
-    .main .logo {
-      margin-top: 0;
-      height: auto;
-    }
-
-    .main .logo a {
-      display: flex;
-      align-items: center;
-    }
-
-    .main .logo .sub-title {
-      margin-left: 0.5em;
-      font-size: 22px;
-      color: #fff;
-      background: linear-gradient(-45deg, #3967FF, #B500FE);
-      -webkit-background-clip: text;
-      -webkit-text-fill-color: transparent;
-    }
-  </style>
-</head>
-<body>
-  <div class="main">
-    <h1 class="logo"><a href="https://www.iconfont.cn/" title="iconfont 首页" target="_blank">
-      <img width="200" src="https://img.alicdn.com/imgextra/i3/O1CN01Mn65HV1FfSEzR6DKv_!!6000000000514-55-tps-228-59.svg">
-      
-    </a></h1>
-    <div class="nav-tabs">
-      <ul id="tabs" class="dib-box">
-        <li class="dib active"><span>Unicode</span></li>
-        <li class="dib"><span>Font class</span></li>
-        <li class="dib"><span>Symbol</span></li>
-      </ul>
-      
-    </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">&#xe605;</span>
-                <div class="name">易粮易运</div>
-                <div class="code-name">&amp;#xe605;</div>
-              </li>
-          
-          </ul>
-          <div class="article markdown">
-          <h2 id="unicode-">Unicode 引用</h2>
-          <hr>
-
-          <p>Unicode 是字体在网页端最原始的应用方式，特点是：</p>
-          <ul>
-            <li>支持按字体的方式去动态调整图标大小，颜色等等。</li>
-            <li>默认情况下不支持多色，直接添加多色图标会自动去色。</li>
-          </ul>
-          <blockquote>
-            <p>注意：新版 iconfont 支持两种方式引用多色图标：SVG symbol 引用方式和彩色字体图标模式。（使用彩色字体图标需要在「编辑项目」中开启「彩色」选项后并重新生成。）</p>
-          </blockquote>
-          <p>Unicode 使用步骤如下：</p>
-          <h3 id="-font-face">第一步：拷贝项目下面生成的 <code>@font-face</code></h3>
-<pre><code class="language-css"
->@font-face {
-  font-family: 'iconfont';
-  src: url('iconfont.ttf?t=1620364525435') format('truetype');
-}
-</code></pre>
-          <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
-<pre><code class="language-css"
->.iconfont {
-  font-family: "iconfont" !important;
-  font-size: 16px;
-  font-style: normal;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-</code></pre>
-          <h3 id="-">第三步：挑选相应图标并获取字体编码，应用于页面</h3>
-<pre>
-<code class="language-html"
->&lt;span class="iconfont"&gt;&amp;#x33;&lt;/span&gt;
-</code></pre>
-          <blockquote>
-            <p>"iconfont" 是你项目下的 font-family。可以通过编辑项目查看，默认是 "iconfont"。</p>
-          </blockquote>
-          </div>
-      </div>
-      <div class="content font-class">
-        <ul class="icon_lists dib-box">
-          
-          <li class="dib">
-            <span class="icon iconfont icon-yiliangyiyun"></span>
-            <div class="name">
-              易粮易运
-            </div>
-            <div class="code-name">.icon-yiliangyiyun
-            </div>
-          </li>
-          
-        </ul>
-        <div class="article markdown">
-        <h2 id="font-class-">font-class 引用</h2>
-        <hr>
-
-        <p>font-class 是 Unicode 使用方式的一种变种，主要是解决 Unicode 书写不直观，语意不明确的问题。</p>
-        <p>与 Unicode 使用方式相比，具有如下特点：</p>
-        <ul>
-          <li>相比于 Unicode 语意明确，书写更直观。可以很容易分辨这个 icon 是什么。</li>
-          <li>因为使用 class 来定义图标，所以当要替换图标时，只需要修改 class 里面的 Unicode 引用。</li>
-        </ul>
-        <p>使用步骤如下：</p>
-        <h3 id="-fontclass-">第一步：引入项目下面生成的 fontclass 代码：</h3>
-<pre><code class="language-html">&lt;link rel="stylesheet" href="./iconfont.css"&gt;
-</code></pre>
-        <h3 id="-">第二步：挑选相应图标并获取类名，应用于页面：</h3>
-<pre><code class="language-html">&lt;span class="iconfont icon-xxx"&gt;&lt;/span&gt;
-</code></pre>
-        <blockquote>
-          <p>"
-            iconfont" 是你项目下的 font-family。可以通过编辑项目查看，默认是 "iconfont"。</p>
-        </blockquote>
-      </div>
-      </div>
-      <div class="content symbol">
-          <ul class="icon_lists dib-box">
-          
-            <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>
-          
-          </ul>
-          <div class="article markdown">
-          <h2 id="symbol-">Symbol 引用</h2>
-          <hr>
-
-          <p>这是一种全新的使用方式，应该说这才是未来的主流，也是平台目前推荐的用法。相关介绍可以参考这篇<a href="">文章</a>
-            这种用法其实是做了一个 SVG 的集合，与另外两种相比具有如下特点：</p>
-          <ul>
-            <li>支持多色图标了，不再受单色限制。</li>
-            <li>通过一些技巧，支持像字体那样，通过 <code>font-size</code>, <code>color</code> 来调整样式。</li>
-            <li>兼容性较差，支持 IE9+，及现代浏览器。</li>
-            <li>浏览器渲染 SVG 的性能一般，还不如 png。</li>
-          </ul>
-          <p>使用步骤如下：</p>
-          <h3 id="-symbol-">第一步：引入项目下面生成的 symbol 代码：</h3>
-<pre><code class="language-html">&lt;script src="./iconfont.js"&gt;&lt;/script&gt;
-</code></pre>
-          <h3 id="-css-">第二步：加入通用 CSS 代码（引入一次就行）：</h3>
-<pre><code class="language-html">&lt;style&gt;
-.icon {
-  width: 1em;
-  height: 1em;
-  vertical-align: -0.15em;
-  fill: currentColor;
-  overflow: hidden;
-}
-&lt;/style&gt;
-</code></pre>
-          <h3 id="-">第三步：挑选相应图标并获取类名，应用于页面：</h3>
-<pre><code class="language-html">&lt;svg class="icon" aria-hidden="true"&gt;
-  &lt;use xlink:href="#icon-xxx"&gt;&lt;/use&gt;
-&lt;/svg&gt;
-</code></pre>
-          </div>
-      </div>
-
-    </div>
-  </div>
-  <script>
-  $(document).ready(function () {
-      $('.tab-container .content:first').show()
-
-      $('#tabs li').click(function (e) {
-        var tabContent = $('.tab-container .content')
-        var index = $(this).index()
-
-        if ($(this).hasClass('active')) {
-          return
-        } else {
-          $('#tabs li').removeClass('active')
-          $(this).addClass('active')
-
-          tabContent.hide().eq(index).fadeIn()
-        }
-      })
-    })
-  </script>
-</body>
-</html>

public/static/logo/iconfont.css

@@ -1,17 +0,0 @@
-@font-face {
-  font-family: "iconfont"; /* Project id  */
-  src: url('iconfont.ttf?t=1620364525435') format('truetype');
-}
-
-.iconfont {
-  font-family: "iconfont" !important;
-  font-size: 16px;
-  font-style: normal;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-.icon-yiliangyiyun:before {
-  content: "\e605";
-}
-

public/static/logo/iconfont.json

@@ -1,16 +0,0 @@
-{
-  "id": "",
-  "name": "",
-  "font_family": "iconfont",
-  "css_prefix_text": "icon-",
-  "description": "",
-  "glyphs": [
-    {
-      "icon_id": "21430593",
-      "name": "易粮易运",
-      "font_class": "yiliangyiyun",
-      "unicode": "e605",
-      "unicode_decimal": 58885
-    }
-  ]
-}

src/api/V2/purchasingManagement/index.js

@@ -14,5 +14,13 @@ export const API_POST_PROCUREMENT_ADD = '/procurementPlanInfo/api/insertProcurem
 export const API_POST_PROCUREMENT_EDIT = '/procurementPlanInfo/api/editProcurementPlan'
 //采购计划删除
 export const API_POST_PROCUREMENT_DELETE = '/procurementPlanInfo/api/deleteProcurementPlan'
+// 采购订单审核
+export const API_POST_ADUIT_PURCHASE = '/purchaseOrder/api/editPurchaseOrder'
+// 采购订单合同
+export const API_GET_ADUIT_CONTRACTNO = '/warehouseBaseInfo/selectContractNoList'
+// 采购订单flag0 补充定金 1解冻定金 2完成 3更改基差
+export const API_POST_EDITSTATUS = '/purchaseOrder/api/editStatus'
 //采购状态，基差，单价修改 
 export const API_POST_PROCUREMENT_EDITSTATUS = '/procurementPlanInfo/api/editStatus'
+// 采购订单删除
+export const API_POST_DELETEPURCHASE = '/purchaseOrder/api/deletePurchaseOrder'

src/api/V2/salesManagement/index.js

@@ -1,9 +1,3 @@
-//销售订单列表
-export const API_GET_SALE_ORDER_LIST = '/saleOrder/selectSaleOrder'
-//销售订单成交
-export const API_POST_SALE_ORDER_DEAL = '/saleOrder/api/deal'
-//销售订单平仓
-export const API_POST_SALE_CLOSEPOSITION = '/saleOrder/api/closePosition'
 //销售计划列表
 export const API_GET_SALEPLAN_LIST = '/salePlanInfo/selectSalePlanInfo'
 //销售计划查看
@@ -15,4 +9,18 @@ export const API_POST_SALEPLAN_EDIT = '/salePlanInfo/api/editSalePlanInfo'
 //销售计划删除
 export const API_POST_SALEPLAN_DELETE = '/salePlanInfo/api/deleteSalePlanInfo'
 //销售状态，基差，单价修改 
-export const API_POST_SALEPLAN_EDITSTATUS = '/salePlanInfo/api/editStatus'
+export const API_POST_SALEPLAN_EDITSTATUS = '/salePlanInfo/api/editStatus' 
+//销售订单列表
+export const API_GET_SALE_ORDER_LIST = '/saleOrder/selectSaleOrder'
+//销售订单成交
+export const API_POST_SALE_ORDER_DEAL = '/saleOrder/api/deal'
+//销售订单平仓
+export const API_POST_SALE_CLOSEPOSITION = '/saleOrder/api/closePosition'
+//销售订单审核编辑
+export const API_POST_ADUIT_SALE = '/saleOrder/api/editSaleOrder'
+//销售订单合同编号下拉列表
+export const API_GET_ADUIT_CONTRACTNO = '/warehouseBaseInfo/selectContractNoList'
+//销售订单flag0 补充定金 1解冻定金 2完成 3更改基差
+export const API_POST_EDITSTATUS = '/saleOrder/api/editStatus'
+//销售订单删除
+export const API_POST_DELETESALE = '/saleOrder/api/deleteSaleOrder'

src/api/V2/statisticalReport/index.js

@@ -0,0 +1,26 @@
+//采购入库报表
+export const API_GET_PURCHRECEIPT = '/purchaseReceiptReport/selectPurchaseOrder'
+//采购订单成交
+export const API_POST_PURCHASING_LIST = '/purchaseOrder/api/deal'
+//采购订单平仓
+export const API_POST_PURCHASING_CLOSEPOSITION = '/purchaseOrder/api/closePosition'
+//采购计划列表
+export const API_GET_PROCUREMENT_LIST = '/procurementPlanInfo/selectProcurementPlanInfo'
+//采购计划查看
+export const API_GET_PROCUREMENT_LOOK = '/procurementPlanInfo/getProcurementPlan'
+//采购计划添加
+export const API_POST_PROCUREMENT_ADD = '/procurementPlanInfo/api/insertProcurementPlanInfo'
+//采购计划编辑
+export const API_POST_PROCUREMENT_EDIT = '/procurementPlanInfo/api/editProcurementPlan'
+//采购计划删除
+export const API_POST_PROCUREMENT_DELETE = '/procurementPlanInfo/api/deleteProcurementPlan'
+// 采购订单审核
+export const API_POST_ADUIT_PURCHASE = '/purchaseOrder/api/editPurchaseOrder'
+// 采购订单合同
+export const API_GET_ADUIT_CONTRACTNO = '/warehouseBaseInfo/selectContractNoList'
+// 采购订单flag0 补充定金 1解冻定金 2完成 3更改基差
+export const API_POST_EDITSTATUS = '/purchaseOrder/api/editStatus'
+//采购状态，基差，单价修改 
+export const API_POST_PROCUREMENT_EDITSTATUS = '/procurementPlanInfo/api/editStatus'
+// 采购订单删除
+export const API_POST_DELETEPURCHASE = '/purchaseOrder/api/deletePurchaseOrder'

src/layout/index/logo.vue

@@ -21,7 +21,6 @@
 </template>
 
 <script>
-import '../../../public/static/logo/iconfont.js';
 import { mapGetters } from 'vuex';
 export default {
   name: 'logo',

src/model/purchasingManagement/index.js

@@ -9,7 +9,11 @@ import {
     API_POST_PROCUREMENT_ADD,
     API_POST_PROCUREMENT_EDIT,
     API_POST_PROCUREMENT_DELETE,
+    API_POST_ADUIT_PURCHASE,
+    API_GET_ADUIT_CONTRACTNO,
+    API_POST_EDITSTATUS,
     API_POST_PROCUREMENT_EDITSTATUS,
+    API_POST_DELETEPURCHASE
 } from '@/api/V2/purchasingManagement'
 // import { API_GET_PROCUREMENT_LOOK } from '../../api/V2/purchasingManagement'
 //采购详情列表
@@ -28,5 +32,13 @@ export const procurementAdd = appRx.post(API_POST_PROCUREMENT_ADD, errorCatcher,
 export const procurementEdit = appRx.post( API_POST_PROCUREMENT_EDIT, errorCatcher, errorHandle,filter)
 //采购计划删除
 export const procurementDel = appRx.post(API_POST_PROCUREMENT_DELETE, errorCatcher,errorHandle,filter)
+//采购订单审核编辑
+export const aduitpurchase = appRx.post(API_POST_ADUIT_PURCHASE, errorCatcher,errorHandle,filter)
+// 采购订单合同编号
+export const aduitcontractno = appRx.get(API_GET_ADUIT_CONTRACTNO, errorCatcher,errorHandle,filter)
+// 采购订单flag0 补充定金 1解冻定金 2完成 3更改基差
+export const editStatus = appRx.post(API_POST_EDITSTATUS, errorCatcher,errorHandle,filter)
 //采购状态，基差，单价修改
 export const procurementEditOther = appRx.post(API_POST_PROCUREMENT_EDITSTATUS, errorCatcher,errorHandle,filter)
+//采购订单删除
+export const deletepurchase = appRx.post(API_POST_DELETEPURCHASE, errorCatcher,errorHandle,filter)

src/model/salesManagement/index.js

@@ -4,6 +4,10 @@ import {
     API_GET_SALE_ORDER_LIST,
     API_POST_SALE_ORDER_DEAL,
     API_POST_SALE_CLOSEPOSITION,
+    API_POST_ADUIT_SALE,
+    API_GET_ADUIT_CONTRACTNO,
+    API_POST_EDITSTATUS,
+    API_POST_DELETESALE,
     API_GET_SALEPLAN_LIST,
     API_GET_SALEPLAN_LOOK,
     API_POST_SALEPLAN_ADD,
@@ -12,11 +16,11 @@ import {
     API_POST_SALEPLAN_EDITSTATUS,
 } from '@/api/V2/salesManagement'
 // import { API_GET_PROCUREMENT_LOOK } from '../../api/V2/purchasingManagement'
-//销售详情列表
+//销售订单列表
 export const detailsList = appRx.get(API_GET_SALE_ORDER_LIST, errorCatcher, errorHandle, filter)
-//销售详情成交
+//销售订单成交
 export const chengList = appRx.post(API_POST_SALE_ORDER_DEAL, errorCatcher, errorHandle, filter)
-//销售详情平仓
+//销售订单平仓
 export const closePositionList = appRx.post(API_POST_SALE_CLOSEPOSITION, errorCatcher, errorHandle,filter)
 //销售计划列表
 export const salePlan = appRx.get(API_GET_SALEPLAN_LIST,errorCatcher, errorHandle, filter)
@@ -30,3 +34,11 @@ export const saleEdit = appRx.post(API_POST_SALEPLAN_EDIT, errorCatcher, errorHa
 export const saleDel = appRx.post(API_POST_SALEPLAN_DELETE, errorCatcher,errorHandle,filter)
 //销售状态，基差，单价修改
 export const saleEditOther = appRx.post(API_POST_SALEPLAN_EDITSTATUS, errorCatcher,errorHandle,filter)
+//销售订单审核
+export const aduitsale = appRx.post(API_POST_ADUIT_SALE, errorCatcher,errorHandle,filter)
+//销售订单合同编号下拉列表
+export const aduitcontractno = appRx.get(API_GET_ADUIT_CONTRACTNO, errorCatcher,errorHandle,filter)
+//销售订单flag0 补充定金 1解冻定金 2完成 3更改基差
+export const editStatus = appRx.post(API_POST_EDITSTATUS, errorCatcher,errorHandle,filter)
+//销售订单删除
+export const deletesale = appRx.post(API_POST_DELETESALE, errorCatcher,errorHandle,filter)

src/model/statisticalReport/index.js

@@ -0,0 +1,7 @@
+import { errorCatcher, errorHandle, filter } from 'base-core-lib'
+import { appRx } from '../defalutConfig/indexRx'
+import {
+    API_GET_PURCHRECEIPT
+} from '@/api/V2/statisticalReport'
+//采购入库报表
+export const getpurchreceipt = appRx.get(API_GET_PURCHRECEIPT, errorCatcher, errorHandle, filter)

src/styles/custom-style.scss

@@ -4,11 +4,11 @@
   background: $scrollPiece;
 }
 
-::-webkit-scrollbar {
-  width: 0px !important;
-  height: 0px !important;
-  z-index: 19891217;
-}
+// ::-webkit-scrollbar {
+//   width: 0px !important;
+//   height: 0px !important;
+//   z-index: 19891217;
+// }
 
 .iconfont {
   color: $iconfontColor;

src/views/customer/customerList.vue

@@ -35,12 +35,13 @@
         >
           默认定金比例</el-button
         >
-        <WinseaContentModal
-          v-model="outerVisibleDefaultEdit"
+        <el-dialog
+          width="25%"
           title="设置默认定金比例"
-          @on-cancel="handleClose"
+          :visible.sync="outerVisibleDefaultEdit"
+          :append-to-body="true"
         >
-          <div style="width: 90%">
+          <div style="width: 50%">
             <div class="dingjin">定金比例(元/吨)</div>
             <el-input
               type="textarea"
@@ -50,43 +51,22 @@
             >
             </el-input>
           </div>
-          <div class="dialog-footer">
+          <div slot="footer" class="dialog-footer">
             <el-button @click="outerVisibleDefaultEdit = false"
               >取 消</el-button
             >
-            <el-button type="primary" @click="editDepositRatio()"
-              >确定</el-button
+            <el-button type="primary" @click="editDefaultDepositRatio()"
+              >确 定</el-button
             >
           </div>
-        </WinseaContentModal>
-
-        <!--修改定金比例-->
-        <WinseaContentModal
-          v-model="outerVisibleEdit"
-          title="修改定金比例"
-          @on-cancel="handleClose"
-        >
-          <div style="width: 90%" class="xiugai">
-            <el-input
-              type="textarea"
-              :rows="2"
-              maxlength="30"
-              placeholder="请输入定金比例"
-              v-model="depositRatio"
-            >
-            </el-input>
-          </div>
-          <div class="dialog-footer">
-            <el-button @click="outerVisibleEdit = false">取 消</el-button>
-            <el-button type="primary" @click="editPrice(0)">确定</el-button>
-          </div>
-        </WinseaContentModal>
+        </el-dialog>
 
         <!--增加定金-->
-        <WinseaContentModal
-          v-model="outerVisibleAdd"
+        <el-dialog
+          width="30%"
           title="增加定金"
-          @on-cancel="handleClose"
+          :visible.sync="outerVisibleAdd"
+          :append-to-body="true"
         >
           <div class="addprice">
             已付定金
@@ -95,7 +75,7 @@
             </div>
           </div>
           <div class="addpricejine">增加金额</div>
-          <div style="width: 90%" class="zengjia">
+          <div style="width: 50%" class="zengjia">
             <el-input
               type="textarea"
               :rows="2"
@@ -106,17 +86,18 @@
             </el-input>
             <div class="yuan">元</div>
           </div>
-          <div class="dialog-footer">
+          <div slot="footer" class="dialog-footer">
             <el-button @click="outerVisibleAdd = false">取 消</el-button>
-            <el-button type="primary" @click="editPrice(1)">确定</el-button>
+            <el-button type="primary" @click="editPrice(1)">确 定</el-button>
           </div>
-        </WinseaContentModal>
+        </el-dialog>
 
         <!--退回定金-->
-        <WinseaContentModal
-          v-model="outerVisibleReturn"
+        <el-dialog
+          width="30%"
           title="退回定金"
-          @on-cancel="handleClose"
+          :visible.sync="outerVisibleReturn"
+          :append-to-body="true"
         >
           <div class="returnprice">
             可退定金
@@ -127,7 +108,7 @@
             </div>
           </div>
           <div class="returnpricejine">退回金额</div>
-          <div style="width: 90%" class="tuihui">
+          <div style="width: 50%" class="tuihui">
             <el-input
               type="textarea"
               :rows="2"
@@ -138,11 +119,11 @@
             </el-input>
             <div class="yuan">元</div>
           </div>
-          <div class="dialog-footer">
+          <div slot="footer" class="dialog-footer">
             <el-button @click="outerVisibleReturn = false">取 消</el-button>
-            <el-button type="primary" @click="editPrice(2)">确定</el-button>
+            <el-button type="primary" @click="editPrice(2)">确 定</el-button>
           </div>
-        </WinseaContentModal>
+        </el-dialog>
       </template>
     </BaseHeaderLayout>
     <div>
@@ -196,19 +177,41 @@
         </el-table-column>
         <el-table-column prop="freezingDeposit" label="冻结定金(元)">
         </el-table-column>
-        <el-table-column prop="depositRatio" label="定金比例(元/吨)">
+        <el-table-column
+          class="table_td"
+          prop="depositRatio"
+          label="定金比例(元/吨)"
+        >
           <template slot-scope="scope">
-            {{ scope.row.depositRatio }}
+            <div class="inputChenge">
+              <!-- readonly -->
+              <el-input
+                v-model="scope.row.depositRatio"
+                v-if="scope.row.identification == 'true'"
+              ></el-input>
+              <div v-if="scope.row.identification == 'false'" class="inputs">
+                {{ scope.row.depositRatio }}
+              </div>
+            </div>
             <img
               width="17"
               height="18"
               style="vertical-align: text-top; position: relative; top: -1px"
               src="../../../public/img/edit.png"
-              @click="editClick(0, scope.row)"
+              @click="whether(scope.row)"
+              v-if="scope.row.identification == 'false'"
               alt=""
             />
+            <i
+              class="el-icon-check"
+              style="line-height: 29px; margin-left: 10px"
+              v-if="scope.row.identification == 'true'"
+              @click="varietyClick(scope.row)"
+            ></i>
+            <!-- <div>—</div> -->
           </template>
         </el-table-column>
+
         <el-table-column prop="updateDate" label="更新时间"> </el-table-column>
         <el-table-column prop="seller" label="操作" width="280">
           <template slot-scope="scope">
@@ -352,6 +355,7 @@ export default {
       }
       return fmt
     },
+
     handleClose() {
       this.accessoryTFs = false
     },
@@ -369,6 +373,66 @@ export default {
       this.searchType = state
       this.getList()
     },
+    //修改定金比例
+    varietyClick(row) {
+       if (
+        row.depositRatio < 0 ||
+        row.depositRatio > 100000 ||
+        (String(row.depositRatio).indexOf('.') != -1 &&
+          String(row.depositRatio).length -
+            (String(row.depositRatio).indexOf('.') + 1) >
+            2)
+      ) {
+        this.$message({
+          message: '定金比例输入错误',
+          type: 'warning',
+        })
+        return
+      }
+      if (row.depositRatio) {
+        if (isNaN(row.depositRatio)) {
+          this.$message({
+            message: '定金比例非数字!',
+            type: 'warning',
+          })
+          return
+        }
+      }
+      if (!row.depositRatio) {
+        this.$message({
+          message: '定金比例不能为空！',
+          type: 'warning',
+        })
+        return
+      }
+      this.$confirm(`确定要修改定金比例？`, {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          editCustomerInfo({
+            flag: 0,
+            depositRatio: row.depositRatio,
+            id: row.id,
+          })
+            .toPromise()
+            .then((response) => {
+              this.$notify.success({
+                title: '成功',
+                message: '修改成功',
+              })
+              this.getList()
+            })
+            .catch((response) => {})
+        })
+        .catch(() => {
+          return false
+        })
+    },
+    whether(row) {
+      row.identification = 'true'
+    },
     //列表查询
     getList() {
       getList({
@@ -380,17 +444,20 @@ export default {
       })
         .toPromise()
         .then((response) => {
+          for (var i = 0; i < response.records.length; i++) {
+            response.records[i].identification = 'false'
+          }
+          this.customerList = response
           this.deptCircularPage.currentPage = response.current
           this.deptCircularPage.pageSize = response.size
           this.deptBudgetTotal = response.total
-          this.customerList = response
         })
     },
     //设置默认定金比例
     installRatio() {
       this.outerVisibleDefaultEdit = true
     },
-    editDepositRatio() {
+    editDefaultDepositRatio() {
       if (
         this.depositRatio < 1 ||
         this.depositRatio > 100000 ||
@@ -439,13 +506,8 @@ export default {
       this.totalDeposit = row.totalDeposit
       this.freezingDeposit = row.freezingDeposit
 
-      //更改定金比例
-      if (index == 0) {
-        this.outerVisibleEdit = true
-        this.customerInfo.flag = 0
-      }
       //增加定金
-      else if (index == 1) {
+      if (index == 1) {
         this.outerVisibleAdd = true
         this.customerInfo.flag = 1
       }
@@ -462,41 +524,9 @@ export default {
       this.customerInfo.money = this.money
       this.customerInfo.totalDeposit = this.totalDeposit
       this.customerInfo.freezingDeposit = this.freezingDeposit
-      //修改定金比例
-      if (asdf == 0) {
-        if (
-          this.depositRatio < 0 ||
-          this.depositRatio > 100000 ||
-          (String(this.depositRatio).indexOf('.') != -1 &&
-            String(this.depositRatio).length -
-              (String(this.depositRatio).indexOf('.') + 1) >
-              2)
-        ) {
-          this.$message({
-            message: '定金比例输入错误',
-            type: 'warning',
-          })
-          return
-        }
-        if (this.depositRatio) {
-          if (isNaN(this.depositRatio)) {
-            this.$message({
-              message: '定金比例非数字!',
-              type: 'warning',
-            })
-            return
-          }
-        }
-        if (!this.depositRatio) {
-          this.$message({
-            message: '定金比例不能为空！',
-            type: 'warning',
-          })
-          return
-        }
-      }
+
       //增加定金
-      else if (asdf == 1) {
+      if (asdf == 1) {
         if (
           this.money < 0 ||
           this.money > 100000000 ||
@@ -573,12 +603,9 @@ export default {
           this.outerVisibleReturn = false
           this.outerVisibleEdit = false
           this.getList()
-          //修改定金比例
-          if (asdf == 0) {
-            this.$message.success('修改定金比例成功')
-          }
+
           //增加定金
-          else if (asdf == 1) {
+          if (asdf == 1) {
             this.$message.success('增加成功')
           }
           //退回定金
@@ -727,7 +754,7 @@ export default {
 }
 /deep/.zengjia .el-textarea__inner {
   display: block;
-  padding: 13px 17px;
+  padding: 13px 9px;
   line-height: 0.5;
   box-sizing: border-box;
   width: 80%;
@@ -737,8 +764,8 @@ export default {
   background-image: none;
   border: 1px solid #dcdfe6;
   border-radius: 4px;
-  transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
   margin-left: 180px;
+  margin-top: 10px;
 }
 
 /deep/.xiugai .el-textarea__inner {
@@ -754,12 +781,12 @@ export default {
   border: 1px solid #dcdfe6;
   border-radius: 4px;
   transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
-  margin-left: 0px;
+  margin-left: 95px;
 }
 
 /deep/.tuihui .el-textarea__inner {
   display: block;
-  padding: 13px 17px;
+  padding: 13px 9px;
   line-height: 0.5;
   box-sizing: border-box;
   width: 80%;
@@ -769,8 +796,8 @@ export default {
   background-image: none;
   border: 1px solid #dcdfe6;
   border-radius: 4px;
-  transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
   margin-left: 180px;
+  margin-top: 10px;
 }
 /deep/.dingjin {
   width: 98px;
@@ -791,7 +818,8 @@ export default {
   border: 1px solid #dcdfe6;
   border-radius: 4px;
   transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
-  margin-left: 180px;
+  margin-left: 155px;
+  margin-top: 10px;
 }
 /deep/.addprice {
   width: 98px;
@@ -803,8 +831,8 @@ export default {
 }
 /deep/.yuan {
   width: 10px;
-  margin-left: 1400px;
-  margin-top: -36px;
+  margin-left: 150%;
+  margin-top: -32px;
 }
 /deep/.addpricejine {
   width: 98px;
@@ -824,11 +852,18 @@ export default {
 /deep/.yifudingjin {
   margin-left: 135px;
   width: 70px;
-  margin-top: -31px;
+  margin-top: -19px;
+}
+.inputChenge {
+  width: 50%;
+  display: inline-flex;
+}
+.inputs {
+  margin: 0 auto;
 }
 /deep/.ketuidingjin {
   margin-left: 135px;
   width: 70px;
-  margin-top: -31px;
+  margin-top: -19px;
 }
 </style>

src/views/purchasingManagement/procurementPlanAdd.vue

@@ -242,6 +242,7 @@
               type="year"
               align="right"
               unlink-panels
+              value-format='yyyy'
               range-separator="至"
               placeholder="开始日期"
             ></el-date-picker>

src/views/purchasingManagement/procurementPlanList.vue

@@ -1,7 +1,6 @@
 //采购计划
 <template>
   <div class="container">
-
     <BaseHeaderLayout :leftSpan="10">
       <template slot="left">
         <ws-button type="primary" @click="handleAdd()">添加</ws-button>
@@ -267,7 +266,6 @@ export default {
       deptCircularPage: {},
       warehouseList: [],
       deptBudgetList: {},
-      pcFlag: 1,
       historyList: [],
       pickerBeginDateBefore: {
         disabledDate: (time) => {
@@ -837,14 +835,13 @@ export default {
 }
 
 .base_header_layout .grid-content.right .find.el-button--primary {
-    width: 30px;
-    margin-left: 0;
-    border-top-left-radius: 0px;
-    border-bottom-left-radius: 0px;
-    margin-top: -1px;
-    margin-left: -6px;
+  width: 30px;
+  margin-left: 0;
+  border-top-left-radius: 0px;
+  border-bottom-left-radius: 0px;
+  margin-top: -1px;
+  margin-left: -6px;
 }
 // .inputChenge>>>.el-input__inner{
 // border: none;
-
 </style>

src/views/salesManagement/salesPlanList.vue

@@ -7,7 +7,7 @@
       <template slot="right">
         <ws-input
           v-model="searchKeyWord"
-          placeholder="可按销售计划编号和标题查找"
+          placeholder="可按采购计划编号和标题查找"
           clearable
           maxlength="500"
           type="input"
@@ -607,9 +607,11 @@ export default {
 }
 /deep/.base_header_layout .grid-content.right .find.el-button--primary {
   width: 30px;
-  margin-left: 0;
-  border-top-left-radius: 0px;
-  border-bottom-left-radius: 0px;
+    margin-left: 0;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+    margin-top: -1px;
+    margin-left: -6px;
 }
 /deep/.findValue .el-input__inner {
   border-top-right-radius: 0px;
@@ -786,6 +788,14 @@ export default {
 .inputs1 {
   border: none;
 }
+.base_header_layout .grid-content.right .find.el-button--primary {
+    width: 30px;
+    margin-left: 0;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+    margin-top: -1px;
+    margin-left: -6px;
+}
 // .inputChenge>>>.el-input__inner{
 // border: none;
 // }

src/views/statisticalReport/purchaseClosingCashierList.vue

@@ -187,9 +187,7 @@
 </template>
 <script>
 import {
-  detailsList,
-  chengList,
-  closePositionList
+  getpurchreceipt
 } from '@/model/purchasingManagement/index'
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
@@ -350,12 +348,10 @@ export default {
       })
     },
     getList() {
-      console.log(123456)
-      detailsList({
+      getpurchreceipt({
         compId: sessionStorage.getItem('ws-pf_compId'),
         currentPage: this.currentPage,
         pageSize: this.pageSize,
-        pcFlag: this.pcFlag,
         searchType: this.searchType,
         searchKeyWord: this.searchKeyWord
       })

src/views/statisticalReport/purchaseReceiptStatisticsList.vue

@@ -2,23 +2,6 @@
 <template>
   <div class="container">
     <el-scrollbar style="height:100%">
-      <el-scrollbar style="width:130%">
-        <el-row>
-          <el-col :span="12">
-            <h2 class="bg-left title"></h2>
-          </el-col>
-          <el-col :span="12" class="bg-right">
-            <el-button class="bg-bottom" type="primary" size="small" @click="revert()">
-              <img
-                width="6"
-                height="10"
-                style="vertical-align: bottom; margin-right: 3px"
-                src="../../../public/img/lujing.png"
-                alt
-              />返回
-            </el-button>
-          </el-col>
-        </el-row>
         <!-- <div> -->
         <div>
           <ws-button type="primary" @click="handleAdd()">待审核</ws-button>
@@ -199,30 +182,30 @@
           <el-table-column type="selection" width="55"></el-table-column>
           <el-table-column type="index" label="序号" width="50"></el-table-column>
           <el-table-column class="table_td" prop="contractNo" label="合同编号"></el-table-column>
-          <el-table-column class="table_td" prop="procurementPlan" label="货名"></el-table-column>
-          <el-table-column class="table_td" prop="customer" label="仓位号"></el-table-column>
-          <el-table-column class="table_td" prop="unitPrice" label="车牌号"></el-table-column>
-          <el-table-column class="table_td" prop="basis" label="入库日期"></el-table-column>
-          <el-table-column class="table_td" prop="freezingDeposit" label="蛋白(%)>="></el-table-column>
+          <el-table-column class="table_td" prop="goodsName" label="货名"></el-table-column>
+          <el-table-column class="table_td" prop="positionNumber" label="仓位号"></el-table-column>
+          <el-table-column class="table_td" prop="carNo" label="车牌号"></el-table-column>
+          <el-table-column class="table_td" prop="warehousingDate" label="入库日期"></el-table-column>
+          <el-table-column class="table_td" prop="protein" label="蛋白(%)>="></el-table-column>
           <el-table-column class="table_td" prop="defaultDeposit" label="水分(%)>="></el-table-column>
-          <el-table-column class="table_td" prop="unloadingCharge" label="单价(元/吨)"></el-table-column>
-          <el-table-column class="table_td" prop="invoiceFee" label="基差(元/吨)"></el-table-column>
-          <el-table-column class="table_td" prop="send" label="卸车费(元/吨)"></el-table-column>
-          <el-table-column class="table_td" prop="stockInQuantity" label="发票费(元/吨)"></el-table-column>
-          <el-table-column class="table_td" prop="openPosition" label="扣款(元/吨)"></el-table-column>
-          <el-table-column class="table_td" prop="closedPosition" label="结算单价(元/吨)"></el-table-column>
-          <el-table-column class="table_td" prop=" cumulativeTurnover" label="净重(吨)"></el-table-column>
-          <el-table-column class="table_td" label="应付金额(元)" prop="type"></el-table-column>
-          <el-table-column class="table_td" label="已付金额(元)"></el-table-column>
-          <el-table-column class="table_td" label="未付金额(元)" prop="type"></el-table-column>
-          <el-table-column class="table_td" label="付款日期"></el-table-column>
-          <el-table-column class="table_td" label="结转"></el-table-column>
-          <el-table-column class="table_td" label="客户确认"></el-table-column>
-          <el-table-column class="table_td" label="客户"></el-table-column>
-          <el-table-column class="table_td" label="库点"></el-table-column>
-          <el-table-column class="table_td" label="发票类型"></el-table-column>
-          <el-table-column class="table_td" label="已开发票(元)"></el-table-column>
-          <el-table-column prop="status" label="状态"></el-table-column>
+          <el-table-column class="table_td" prop="unitPrice" label="单价(元/吨)"></el-table-column>
+          <el-table-column class="table_td" prop="basisPrice" label="基差(元/吨)"></el-table-column>
+          <el-table-column class="table_td" prop="unloadingCharge" label="卸车费(元/吨)"></el-table-column>
+          <el-table-column class="table_td" prop="invoiceFee" label="发票费(元/吨)"></el-table-column>
+          <el-table-column class="table_td" prop="deductionAmount" label="扣款(元/吨)"></el-table-column>
+          <el-table-column class="table_td" prop="settlementPrice" label="结算单价(元/吨)"></el-table-column>
+          <el-table-column class="table_td" prop="netWeight" label="净重(吨)"></el-table-column>
+          <el-table-column class="table_td" label="应付金额(元)" prop="amountIngPayable"></el-table-column>
+          <el-table-column class="table_td" label="已付金额(元)" prop="amountEdPayable"></el-table-column>
+          <el-table-column class="table_td" label="未付金额(元)" prop="amountNotPayable"></el-table-column>
+          <el-table-column class="table_td" label="付款日期"  prop="paymentDate"></el-table-column>
+          <el-table-column class="table_td" label="结转" prop="carryForward"></el-table-column>
+          <el-table-column class="table_td" label="客户确认"  prop="customerConfirmationStatus"></el-table-column>
+          <el-table-column class="table_td" label="客户" prop="customerName"></el-table-column>
+          <el-table-column class="table_td" label="库点"  prop="warehouseName"></el-table-column>
+          <el-table-column class="table_td" label="发票类型"  prop="invoiceTypeKey"></el-table-column>
+          <el-table-column class="table_td" label="已开发票(元)"  prop="alreadyInvoice"></el-table-column>
+          <el-table-column label="状态" prop="status"></el-table-column>
         </el-table>
 
         <!-- 页数 -->
@@ -234,7 +217,6 @@
           layout="total, sizes, prev, pager, next, jumper"
           :total="deptBudgetTotal"
         ></el-pagination>
-      </el-scrollbar>
     </el-scrollbar>
   </div>
 
@@ -242,10 +224,8 @@
 </template>
 <script>
 import {
-  detailsList,
-  chengList,
-  closePositionList
-} from '@/model/purchasingManagement/index'
+  getpurchreceipt
+} from '@/model/statisticalReport/index'
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
@@ -340,6 +320,9 @@ export default {
       deptCircularPage: {},
       warehouseList: [],
       deptBudgetList: {},
+       currentPage: 1,
+      pageSize: 10,
+      searchType: 1,
       pcFlag: 1,
       historyList: [],
       pickerBeginDateBefore: {
@@ -352,6 +335,7 @@ export default {
   },
   activated() {
     // this.loaddata()
+    console.log(1111)
     this.getList()
     this.showType = this.isShow
   },
@@ -424,12 +408,10 @@ export default {
       })
     },
     getList() {
-      console.log(123456)
-      detailsList({
+      getpurchreceipt({
         compId: sessionStorage.getItem('ws-pf_compId'),
         currentPage: this.currentPage,
         pageSize: this.pageSize,
-        pcFlag: this.pcFlag,
         searchType: this.searchType,
         searchKeyWord: this.searchKeyWord
       })

vue.config.js

@@ -58,19 +58,16 @@ const cdn = {
   css: {
     dev: [
       "/cdn/element-ui/2.13.2/theme-chalk/index.css",
-      `./static/iconfont/iconfont.css`,
-      `./static/logo/iconfont.css`
+      `./static/iconfont/iconfont.css`
     ],
     ship: [
       "/cdn/element-ui/2.13.2/theme-chalk/index.css",
-      `./static/iconfont/iconfont.css`,
-      `./static/logo/iconfont.css`
+      `./static/iconfont/iconfont.css`
     ],
     product: [
       `/cdn/winseaview/index.css`,
       "/cdn/element-ui/2.13.2/theme-chalk/index.css",
-      `./static/iconfont/iconfont.css`,
-      `./static/logo/iconfont.css`
+      `./static/iconfont/iconfont.css`
     ]
   }
 }
@@ -144,8 +141,9 @@ module.exports = {
         // target: 'https://product-server.winsea.com/', //目标地址
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
-        // target: 'http://192.168.1.121:8090/',
         target: 'http://192.168.1.120:8090/',
+        // target: 'http://192.168.1.112:8090/',
+        // target: 'http://192.168.1.121:8090/',
         // target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',