Merge branch 'master' of http://git.zthymaoyi.com:3000/gdc/yiliangyiyun-pc

src/views/home/index.vue

@@ -54,15 +54,15 @@
                 <div class="left-card">
                   <div class="item">
                     <p>在途车辆</p>
-                    <p><span class="number">76</span><span class="number-text">台</span></p>
+                    <p><span class="number">{{carCount1}}</span><span class="number-text">台</span></p>
                   </div>
                   <div class="item">
                     <p>装货车辆</p>
-                    <p><span class="number" style="color:#ffa523;">86</span><span class="number-text">台</span></p>
+                     <p><span class="number" style="color:#ffa523">{{carCount2}}</span><span class="number-text">台</span></p>
                   </div>
                   <div class="item">
                     <p>卸货车辆</p>
-                    <p><span class="number" style="color: #2483ff;">16</span><span class="number-text">台</span></p>
+                     <p><span class="number" style="color:#2483ff">{{carCount3}}</span><span class="number-text">台</span></p>
                   </div>
                 </div>
               </el-col>
@@ -211,10 +211,13 @@
 
     data() {
       return {
+        carCount1:'',
+        carCount2:'',
+        carCount3:'',
         chartsData: [],
         nowDate: null, //存放年月日变量
         nowTime: null, //存放时分秒变量
-        timer: "", //定义一个定时器的变量
+        timer: '', //定义一个定时器的变量
         currentTime: new Date(), // 获取当前时间
         timer: '',
         dialogVisible: false,
@@ -354,6 +357,10 @@
       getChartsData().toPromise().then(res => {
         console.log(res)
         this.chartsData = res
+        this.carCount1 = res[6].biViewInfoList[0].count
+        this.carCount2 = res[6].biViewInfoList[1].count
+        this.carCount3 = res[6].biViewInfoList[2].count
+
         this.initCharts()
       })
       // if (this.vesselBankFlag !== 'V') {
@@ -413,23 +420,22 @@
         this.second = check(second);
 
         function check(i) {
-          const num = (i < 10) ? ("0" + i) : i;
+          const num = (i < 10) ? ('0' + i) : i;
           return num;
         }
-        this.nowDate = year + "-" + this.month + "-" + this.day;
-        this.nowTime = this.hour + ":" + this.minute + ":" + this.second;
+        this.nowDate = year + '-' + this.month + '-' + this.day;
+        this.nowTime = this.hour + ':' + this.minute + ':' + this.second;
       },
       initCharts() {
         let app = this;
-        var roseCharts = document.getElementsByClassName("roseChart");
+        var roseCharts = document.getElementsByClassName('roseChart');
         for (let i = 0; i < roseCharts.length; i++) {
           let myChart = app.$echarts.init(roseCharts[i]);
           let color = []
           let data = []
-          let text = ""
-          let formatter = ""
+          let text = ''
+          let formatter = ''
           let graphicText = ''
-          debugger
           switch (i) {
             case 0:
               // 圆环图各环节的颜色
@@ -537,7 +543,7 @@
               selectedMode: true, // 图例选择的模式，控制是否可以通过点击图例改变系列的显示状态。默认开启图例选择，可以设成 false 关闭。
               top: '10%',
               left: 'center',
-              con: "circle",
+              con: 'circle',
               itemWidth: 10, // 设置宽度
               itemHeight: 10, // 设置高度
               itemGap: 40, // 设置间距
@@ -598,10 +604,10 @@
               data: data // 系列中的数据内容数组。
             }]
           })
-          myChart.off("click");
-          myChart.on("click", function(params) {
+          myChart.off('click');
+          myChart.on('click', function(params) {
             //  var a = params.dataIndex
-            console.log(params, "我被点击了");
+            console.log(params, '我被点击了');
             app.dialogVisible = true
           })
         }
@@ -818,14 +824,12 @@
             label: {
               show: true,
               position: 'top',
-              color: "#b0b1b3"
+              color: '#b0b1b3'
             },
             data: [3000, 4000, 4200, 4500, 6000, 5600, 4500, 5020, 4500, 5400, 4300]
           }]
         };
-
         myChart7.setOption(zoption)
-
       },
       handleClose(done) {
         this.$confirm('确认关闭？')
@@ -1221,7 +1225,7 @@
               }
             }
 
-            setTimeout(1000)
+            // setTimeout(1000)
             if (parseInt(result)) {
               console.log('result:', result);
               this.text = parseInt(result)
@@ -1985,4 +1989,5 @@
     right: 10px;
     bottom: 10px;
   }
+
 </style>

src/views/houseSelfCollect/customerManagement.vue

@@ -35,15 +35,16 @@
           <span v-else>{{ scope.$index + 1 }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="customerName" label="客户"></el-table-column>
+      <el-table-column prop="customerName" label="供应商"></el-table-column>
       <el-table-column prop="customerPhone" label="手机号"></el-table-column>
+      <el-table-column prop="payeeName" label="收款人"></el-table-column>
+      <el-table-column prop="completedQuantity" label="已完成量(吨)"></el-table-column>
       <el-table-column prop="bankCard" label="银行卡号"></el-table-column>
       <el-table-column prop="bankDeposit" label="开户行">
         <template slot-scope="scope">
-          <div>{{scope.row.bankDeposit}}-{{scope.row.bankDepositBranch}}</div> 
+          <div>{{scope.row.bankDeposit}}-{{scope.row.bankDepositBranch}}</div>
         </template>
       </el-table-column>
-      <el-table-column prop="payeeName" label="收款人"></el-table-column>
       <el-table-column prop="authenticationStatus" label="状态"></el-table-column>
       <el-table-column prop="address" label="操作" width="300">
         <template slot-scope="scope">
@@ -106,7 +107,7 @@
            this.qrcode = response
           })
         }
-        
+
       },
       //创建客户
       createCustomer(row, num) {

src/views/houseSelfCollect/inspectInfo.vue

@@ -89,9 +89,15 @@
             <ws-form-item label="净重单价（元/公斤）" span="1" prop="tidalGrainPrice" v-if="inspect.type == '潮粮'">
               <ws-input type="number" @mousewheel.native.prevent v-model="inspect.tidalGrainPrice" placeholder="请输入净重单价" maxlength="10" size="small" :disabled="disabled2" />
             </ws-form-item>
-            <ws-form-item label="干粮单价（元/公斤）" span="1" prop="dryGrainPrice" v-if="inspect.type == '干粮'">
+            <ws-form-item label="干粮单价（元/公斤）" span="2" prop="dryGrainPrice" v-if="inspect.type == '干粮'">
               <ws-input type="number" @mousewheel.native.prevent v-model="inspect.dryGrainPrice" placeholder="请输入干粮单价" maxlength="10" size="small"  :disabled="disabled2" />
             </ws-form-item>
+            <el-row>
+                <ws-form-item label="复检备注" span="2" prop="reMemo" v-if="information == '编辑复检'">
+                  <ws-input type="textarea" v-model="inspect.reMemo" placeholder="请输入复检备注" maxlength="300"/>
+               </ws-form-item>
+            </el-row>
+           
           </ws-info-table>
 
           <div class="title">质检数据</div>
@@ -988,8 +994,12 @@
 
   /deep/.ws-info-table .el-form-item .el-form-item__content {
     border: none;
+    overflow: auto!important;
+    height: 55px;
   }
-
+/deep/.el-textarea__inner{
+  width: 100%;
+}
   .title {
     font-size: 16px;
     font-weight: 600;

src/views/houseSelfCollect/weightCheck.vue

@@ -556,7 +556,7 @@
               }
             }
 
-            setTimeout(1000)
+            // setTimeout(1000)
             // value 是一个 Uint8Array
           }
           await port.close();

src/views/outboundManagement/weighing.vue

@@ -282,7 +282,7 @@
 						}
 					}
 				}
-				setTimeout(1000)
+				// setTimeout(1000)
 				// value 是一个 Uint8Array
 				}
 				await port.close();

src/views/warehouse/warehouseManagementEdit.vue

@@ -132,7 +132,8 @@
     billoperatehis,
     getLook,
     edit,
-    delPosition
+    delPosition,
+    getstaff
   } from '@/model/warehouse/index'
   import {
     regionData,
@@ -222,16 +223,29 @@
     },
     activated() {
       this.loaddata()
-      getstafffind({
-          roles: 'd6a5c8a52da544309259f91f75de1ec6'
-        })
-        .toPromise()
-        .then((response) => {
-          this.options = response
-          this.optionsOther = response
-          this.staffList1 = response
-          this.staffList = response
-        })
+      // getstafffind({
+      //     roles: 'd6a5c8a52da544309259f91f75de1ec6'
+      //   })
+      //   .toPromise()
+      //   .then((response) => {
+      //     this.options = response
+      //     this.optionsOther = response
+      //     this.staffList1 = response
+      //     this.staffList = response
+      //   })
+      getstaff({
+        compId: localStorage.getItem('ws-pf_compId')
+      })
+      .toPromise()
+      .then((response) => {
+        this.options = response
+        this.optionsOther = response
+        this.staffList = response
+        this.staffList1 = response
+        // for(var i=0;i<response.length;i++){
+        //   this.optionsOther.push(response[i].staffName+" "+response[i].staffMobilePhone)
+        // }
+      })
       this.showType = this.isShow
     },
     computed: {
@@ -251,7 +265,7 @@
     },
     methods: {
       getAddress(data) {
-        console.log("getAddress", data)
+        console.log('getAddress', data)
         this.deptBudgetList.warehousePrivate = data[0]
         this.deptBudgetList.warehouseCity = data[1]
         this.deptBudgetList.warehouseArea = data[2]

src/views/warehouse/warehouseManagementGross.vue

@@ -557,7 +557,7 @@
                 }
               }
             }
-            setTimeout(1000)
+            // setTimeout(1000)
             // value 是一个 Uint8Array
           }
           await port.close();

src/views/warehouse/warehouseManagementNoWeightIn.vue

@@ -568,7 +568,7 @@
                 this.dataList.tare = parseInt(result + this.result1)
               }
             }
-            setTimeout(1000)
+            // setTimeout(1000)
             // value 是一个 Uint8Array
           }
           await port.close();

src/views/warehouse/warehouseManagementNoWeightOut.vue

@@ -504,7 +504,7 @@
                 this.dataList.grossWeight = parseInt(result + this.result1)
               }
             }
-            setTimeout(1000)
+            // setTimeout(1000)
             // value 是一个 Uint8Array
           }
           await port.close();

src/views/warehouse/warehouseManagementTare.vue

@@ -486,7 +486,7 @@
                 }
               }
             }
-            setTimeout(1000)
+            // setTimeout(1000)
             // value 是一个 Uint8Array
           }
           await port.close();