Procházet zdrojové kódy

检斤添加字段

mxx před 3 roky
rodič
revize
a5857a5846

+ 1 - 1
src/views/contractManagement/purchaseContractAdd.vue

@@ -86,7 +86,7 @@
              -->
             <ws-select  v-model="deptBudgetList.seller" placeholder="请选择卖方名称" class="typeselect" 
             @change="sellerSelect">
-            <ws-option v-for="item in customerinfo" :key="item.customerName"  :label="item.customerName"
+            <ws-option v-for="(item,index) in customerinfo" :key="index"  :label="item.customerName"
               :value="item.customerName" />
           </ws-select>
         </ws-form-item>

+ 0 - 1
src/views/houseSelfCollect/inspectionManagement.vue

@@ -215,7 +215,6 @@
 				})
 			},
 			warehouseNameChange(e) {
-				debugger
 				for (let i = 0; i < this.warehouseList.length; i++) {
 					if (this.warehouseList[i].value == e) {
 						this.warehouseName = this.warehouseList[i].value

+ 34 - 14
src/views/houseSelfCollect/weightCheck.vue

@@ -44,8 +44,8 @@
         <ws-form class='right-content'>
           <div class="left">
             <div class="tab">
-              <div class="tab-item" :class="index==0?'active':''" @click="tabClick(0)"> 待称毛重({{mList.length}})</div>
-              <div class="tab-item" :class="index==1?'active':''" @click="tabClick(1)">待称皮重({{pList.length}})</div>
+              <div class="tab-item" :class="index==0?'active':''" @click="tabClick(0)"> 待称毛重({{mListTop.length}})</div>
+              <div class="tab-item" :class="index==1?'active':''" @click="tabClick(1)">待称皮重({{pListTop.length}})</div>
             </div>
             <div class="title">基本信息</div>
             <ws-info-table>
@@ -112,13 +112,15 @@
               <el-button @click="print" v-if="this.information == '皮重'" type="primary">保存并打印</el-button>
             </div>
           </div>
-          <div class="right">
+          <div class="car-right">
             <el-table ref="singleTable" :data="carList" highlight-current-row @current-change="handleCurrentChange"
-              style="width: 100%;overflow:auto;height: calc(100% - 32px);">
+              style="width: 100%;overflow:auto;height:680px">
               <el-table-column property="number" label="编号">
               </el-table-column>
               <el-table-column property="carNumber" label="车牌号">
               </el-table-column>
+               <el-table-column property="status" label="状态">
+              </el-table-column>
             </el-table>
             <div style="text-align: center">
               <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
@@ -234,6 +236,10 @@
         warehouseName: '',
         result1: '00',
         allowEdit: 0,
+        mListTop:[],
+        mListBottom:[],
+        pListTop:[],
+        pListBottom:[]
       }
     },
     activated() {
@@ -339,14 +345,21 @@
               continue
             }
           }
-          if (_list[i].status == '已质检' || _list[i].status == '已称毛重') {
-            this.mList.push(_list[i])
+          if (_list[i].status == '已质检') {
+            this.mListTop.push(_list[i])
           }
-
-          if ((_list[i].status == '已称皮重' || _list[i].status == '已称毛重')) {
-            this.pList.push(_list[i])
+           if (_list[i].status == '已称毛重') {
+            this.mListBottom.push(_list[i])
+          }
+          if (_list[i].status == '已称皮重') {
+            this.pListBottom.push(_list[i])
+          }
+          if (_list[i].status == '已称毛重') {
+              this.pListTop.push(_list[i])
           }
         }
+       this.mList= this.mListTop.concat(this.mListBottom)
+       this.pList= this.pListTop.concat(this.pListBottom)
         if (this.information == '毛重') {
           this.index = 0
           this.carList = this.mList
@@ -414,6 +427,10 @@
         }
       },
       tabClick(val) {
+        this.mListTop=[]
+        this.mListBottom=[]
+        this.pListTop=[]
+        this.pListBottom=[]
         this.carWeightInfo.carNumber = ''
         this.weighingList = []
         this.index = val
@@ -828,6 +845,7 @@
 
   .ws-info-table {
     border: none;
+    height: 610px;
   }
 
   .ws-info-table .el-form-item {
@@ -872,6 +890,8 @@
   }
 
   .substance {
+      padding-bottom: 20px;
+      overflow-y: scroll;
     .active {
       background: #5878e8;
       color: white;
@@ -926,10 +946,10 @@
     }
 
     .right {
-      width: 60%;
+      width: 70%;
       padding: 20px;
+      height: 750px;
       background: white;
-      margin-right: 20px;
       border-radius: 10px;
 
       .tab {
@@ -1040,7 +1060,6 @@
 
   .right-content {
     display: flex;
-    height: 100%;
 
     .left {
       position: relative;
@@ -1049,7 +1068,6 @@
         position: absolute;
         left: 0;
         right: 0;
-        bottom: 20px;
         margin: auto;
       }
     }
@@ -1057,7 +1075,9 @@
     .left,
     .right {
       width: 50%;
-      height: 100%;
     }
   }
+  .car-right{
+    width: 50%;
+  }
 </style>