入库检斤sdy

src/views/houseSelfCollect/newWeighingManagement.vue

@@ -119,7 +119,7 @@
               </ws-form-item>
               <div class="formItem">
                 <ws-form-item label="扣重(KG)" span="1" prop="buckleMiscellaneous"
-                  v-if="information == '皮重' && paramType == '2' || inWarehouseType == 1">
+                  v-if="information == '皮重' && (paramType == '2' || inWarehouseType == 1)">
                   <ws-input type="number" @mousewheel.native.prevent v-model="weighingList.buckleMiscellaneous"
                     @input="calculation" placeholder="请输入扣重" maxlength="100" size="small" />
                 </ws-form-item>
@@ -438,6 +438,7 @@
             })
           }
         }
+this.deptBudgetTotal = this.carList.length
       },
       handleSizeChange(val) {
         console.log(`每页 ${val} 条`)
@@ -980,7 +981,7 @@
                         )
                         warehousing.backOffice = _data.content.showCompName + '-' + _data.content.staffName
                         warehousing.grossWeight = this.weighingList.grossWeight 
-                        warehousing.tare= this.weighingList.tare
+                        warehousing.tare = this.weighingList.tare
                         warehousing.netWeight = this.weighingList.netWeight 
                         warehousing.pureWeight = this.weighingList.pureWeight
                         warehousing.deductionAmount = this.weighingList.deductionAmount
@@ -1042,14 +1043,18 @@
                             })
                             //贸易入库需要走再入库接口
                             if(this.inWarehouseType == 1){
-                                warehousing.grossWeight /= 1000
+                              warehousing.grossWeight /= 1000
                               warehousing.tare /= 1000
                               warehousing.netWeight /= 1000 
                               warehousing.pureWeight =  1000
                               warehousing.deductionAmount *= 1000
                               warehousing.deductionWeight /=  1000 
-                               warehousing.statusFlag = 1
-                            addstorageputList(warehousing).toPromise().then((response) => {})
+                              warehousing.statusFlag = 1
+                            addstorageputList(warehousing).toPromise().then((response) => {
+                              // if(response == "OK"){
+                              //   this.getList()
+                              // }
+                            })
                         }
                           })
                           .catch((response) => {
@@ -1142,7 +1147,7 @@
   }
 
   /deep/.ws-info-table .el-form-item .el-form-item__label {
-    width: 30%;
+    width: 25%;
     text-align: center;
     background: #ffffff;
     font-size: 14px;
@@ -1191,7 +1196,7 @@
         margin: 0 20px 20px 20px;
         position: absolute;
         top: 130px;
-        width: 90%;
+        width: 91%;
 
         .zujian {
           position: relative;
@@ -1271,14 +1276,15 @@
           border-radius: 10px;
         }
         .in_css,.in_cssno,.in_cssno1,.in_css1{
-          width: 76px;
+          width: 80px;
           height: 32px;
           padding: 3px 10px;
           border-radius: 4px;
           margin-right: 10px;
-          font-size: 14px;
+          font-size: 15px;
           line-height: 28px;
           text-align: center;
+          font-weight: 600;
         }
         .in_css{
           color: #5878E8;
@@ -1484,6 +1490,9 @@
         color: #5878E8 ;
       }
     }
+    /deep/.el-select{
+      width: 50%;
+    }
   }
   .frame{
     border-bottom: 1px solid #D8DCE6;

src/views/houseSelfCollect/weightCheckRecord.vue

@@ -15,13 +15,8 @@
     <div class="center">
       <el-row>
         <el-col :span="12">
-          <div class="centertitle">
-            <el-button :type="warehousingType == 1?'primary':''" size="small" @click="changeType(1)" class="btn_css">贸易入库</el-button>
-            <el-button :type="warehousingType == 3?'primary':''" size="small" @click="changeType(3)" class="btn_css">收购入库</el-button>
-          </div>
-          <el-button :type="choice == ''?'primary':''" size="small" @click="screen()" class="btn_css">全部</el-button>
-          <el-button :type="choice == 2?'primary':''" size="small" @click="screen(2)" class="btn_css">已称毛重</el-button>
-          <el-button :type="choice == 3?'primary':''" size="small" @click="screen(3)" class="btn_css">已称皮重</el-button>
+            <el-button :type="warehousingType == 1?'primary':''" size="small" @click="changeType(1)" class="btn_css btn_topcss">贸易入库</el-button>
+            <el-button :type="warehousingType == 3?'primary':''" size="small" @click="changeType(3)" class="btn_css btn_topcss">收购入库</el-button>
         </el-col>
         <el-col :span="12" class="bg-right">
           <div style="display:flex">
@@ -29,12 +24,15 @@
               <el-option v-for="item in warehouseList" :key="item.id" :label="item.warehouseName"
                 :value="item.warehouseName"></el-option>
             </el-select>
-            <el-input placeholder="可按业务编号、合同编号、车牌号查找" clearable v-model="searchKeyWord" class="search_css"></el-input>
+            <el-input :placeholder="warehousingType == 1 ? '可按业务编号、合同编号/移库编号、车牌号查找':'可按业务编号、车牌号、客户名查找'" clearable v-model="searchKeyWord" class="search_css"></el-input>
             <!-- <el-input placeholder="可按业务编号、车牌号、客户名查找" clearable v-model="searchKeyWord"></el-input> -->
             <el-button type="primary" size="small" @click="lookup">查找</el-button>
           </div>
         </el-col>
       </el-row>
+       <el-button :type="choice == ''?'primary':''" size="small" @click="screen()" class="btn_css">全部</el-button>
+          <el-button :type="choice == 2?'primary':''" size="small" @click="screen(2)" class="btn_css">已称毛重</el-button>
+          <el-button :type="choice == 3?'primary':''" size="small" @click="screen(3)" class="btn_css">已称皮重</el-button>
       <el-table class="forData" :data="weighingRecordList" style="width: 100%; margin-top: 20px" height="780">
         <el-table-column type="index" label="序号" width="80">
           <template scope="scope">
@@ -43,7 +41,13 @@
           </template>
         </el-table-column>
         <el-table-column prop="number" label="业务编号"></el-table-column>
-        <el-table-column prop="contractNo" label="合同编号/移库编号" v-if="warehousingType == 1" width="130"></el-table-column>
+        <el-table-column prop="contractNo" label="合同编号/移库编号" v-if="warehousingType == 1" width="130">
+        <template scope="scope">
+          <span v-if="scope.row.contractNo">{{scope.row.contractNo}}</span>
+          <span v-else>{{scope.row.moveTaskNo}}</span>
+        </template>
+        
+        </el-table-column>
         <!--//moveTaskNo -->
         <el-table-column prop="customer" label="客户" v-if="warehousingType == 3"></el-table-column>
         <el-table-column prop="carNumber" label="车牌号"></el-table-column>
@@ -112,6 +116,7 @@
         warehousingType: 1,
         isShowPrint:false,
         dialogData:{},
+        title:"",
       }
     },
     activated() {
@@ -297,8 +302,13 @@
       width: 90%;
     }
   }
+  .btn_topcss{
+    margin-top: 15px;
+
+  }
   .btn_css{
       width: 90px;
+      margin-left: 10px;
     }
     .search_css{
       margin: 0 20px;