前端

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">&#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>
@@ -192,9 +210,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1629941156348') format('woff2'),
-       url('iconfont.woff?t=1629941156348') format('woff'),
-       url('iconfont.ttf?t=1629941156348') format('truetype');
+  src: url('iconfont.woff2?t=1635728227466') format('woff2'),
+       url('iconfont.woff?t=1635728227466') format('woff'),
+       url('iconfont.ttf?t=1635728227466') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -220,6 +238,33 @@
       <div class="content font-class">
         <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">
@@ -427,6 +472,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-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>

public/static/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 2554236 */
-  src: url('iconfont.woff2?t=1629941156348') format('woff2'),
-       url('iconfont.woff?t=1629941156348') format('woff'),
-       url('iconfont.ttf?t=1629941156348') format('truetype');
+  src: url('iconfont.woff2?t=1635728227466') format('woff2'),
+       url('iconfont.woff?t=1635728227466') format('woff'),
+       url('iconfont.ttf?t=1635728227466') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,18 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-kehuzijin:before {
+  content: "\e615";
+}
+
+.icon-a-4-shougoubeifen:before {
+  content: "\e614";
+}
+
+.icon-chukuguanlibeifen:before {
+  content: "\e613";
+}
+
 .icon-a-tongzhibeifen2:before {
   content: "\e612";
 }

public/static/iconfont/iconfont.json

@@ -5,6 +5,27 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "25314150",
+      "name": "kehuzijin",
+      "font_class": "kehuzijin",
+      "unicode": "e615",
+      "unicode_decimal": 58901
+    },
+    {
+      "icon_id": "25314041",
+      "name": "shougou",
+      "font_class": "a-4-shougoubeifen",
+      "unicode": "e614",
+      "unicode_decimal": 58900
+    },
+    {
+      "icon_id": "25314040",
+      "name": "chukuguanli备份",
+      "font_class": "chukuguanlibeifen",
+      "unicode": "e613",
+      "unicode_decimal": 58899
+    },
     {
       "icon_id": "23871028",
       "name": "gongzuotongzi",

src/views/customerFundManagement/component/router/router.js

@@ -9,7 +9,7 @@ const customerFundManagementRouter = {
     meta: {
       title: 'customerFundList',
     //   module: 'customerManagement.customer.customerInfo',
-      icon: '-kehuguanli'
+      icon: '-kehuzijin'
     },
     children: [
         //客户资金管理列表

src/views/houseSelfCollect/component/routers/route.js

@@ -9,7 +9,7 @@ const houseSelfCollectRouter = {
   meta: {
     title: 'houseSelfCollect',
     module: 'acquisitionManagement',
-    icon: '-hetongguanli'
+    icon: '-a-4-shougoubeifen'
   },
   children: [
     // 客户管理

src/views/houseSelfCollect/inspectInfo.vue

@@ -163,6 +163,7 @@
     data() {
       return {
         isShowPrint: false,
+        customerList1:[],
         // warehouseList: {},
         inspect: {
           tidalGrainPrice: 0,
@@ -679,6 +680,12 @@
       customerChange(e) {
         let customers = e.split('(')
         this.inspect.customerName = customers[0]
+        for (let i = 0; i < this.customerList1.length; i++) {
+          console.log(this.customerList1[i].customerName,this.inspect.customerName)
+          if(this.customerList1[i].customerName==this.inspect.customerName){
+            this.inspect.customerNumberCard=this.customerList1[i].customerNumberCard
+          }
+        }
         this.inspect.customerPhone = customers[1].split(')')[0]
         if(this.inspect.goodsName && this.inspect.customerName){
           // //查看当前用户对应货名有未结算状态的送货
@@ -687,6 +694,7 @@
           compId: sessionStorage.getItem('ws-pf_compId'),
           customerName: this.inspect.customerName,
           goodsName: this.inspect.goodsName,
+          customerNumberCard:this.inspect.customerNumberCard
         })  .toPromise()
           .then((response) => {
                count = response
@@ -696,6 +704,7 @@
           compId: sessionStorage.getItem('ws-pf_compId'),
           customerName: this.inspect.customerName,
           goodsName: this.inspect.goodsName,
+          customerNumberCard:this.inspect.customerNumberCard
         })
           .toPromise()
           .then((response) => {
@@ -767,6 +776,7 @@
           compId: sessionStorage.getItem('ws-pf_compId'),
           customerName: this.inspect.customerName,
           goodsName: this.inspect.goodsName,
+          customerNumberCard:this.inspect.customerNumberCard
         })  .toPromise()
           .then((response) => {
                count = response
@@ -776,6 +786,7 @@
           compId: sessionStorage.getItem('ws-pf_compId'),
           customerName: this.inspect.customerName,
           goodsName: this.inspect.goodsName,
+          customerNumberCard:this.inspect.customerNumberCard
         })
           .toPromise()
           .then((response) => {
@@ -818,6 +829,7 @@
           })
           .toPromise()
           .then((response) => {
+            this.customerList1=response
             this.customerList = []
             let customer = response
             for (let i = 0; i < response.length; i++) {

src/views/outboundManagement/component/route.js

@@ -9,7 +9,7 @@ const outboundManagementRouter = {
     meta: {
         title: 'outboundManagement',
         module: 'outbound',
-        icon: '-hetongguanli'
+        icon: '-chukuguanlibeifen'
     },
     children: [
         // 检斤管理

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -66,6 +66,7 @@
         <el-table-column prop="weight" class="table_td" label="重量（吨）"></el-table-column>
         <el-table-column prop="predictDate" class="table_td" label="预计日期"></el-table-column>
         <el-table-column prop="publisher" class="table_td" label="发布者"></el-table-column>
+        <el-table-column prop="completedQuantity" class="table_td" label="已完成量"></el-table-column>
         <el-table-column prop="taskStatus" label="状态" width="90">
           <template slot-scope="scope">
             <template>

vue.config.js

@@ -141,8 +141,8 @@ module.exports = {
         // target: 'https://product-server.winsea.com/', //目标地址
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
-        // target: 'http://192.168.1.107/:8090/',
         target: 'http://192.168.1.107:8090/',
+        // target: 'http://192.168.1.115:8090/',
         // target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',