Merge branch 'master' of git.echepei.com:zhujiawei/Warehouse_management_ui into master

src/views/track/cabinet/index.vue

@@ -231,10 +231,30 @@
         >
       </el-col>
       <el-col :span="1.5">
-        <el-button size="mini" @click="handleQuery(null)">全 部</el-button>
+<!--        <el-button size="mini" @click="handleQuery(null)">全 部</el-button>-->
+        <el-badge
+          :value="buttonValue.quantity"
+          type="warning"
+          style="margin-right: 10px"
+        >
+          <el-button size="mini" @click="handleQuery()"
+          >全 部</el-button
+          >
+        </el-badge>
       </el-col>
       <el-col :span="1.5">
         <el-badge
+          :value="buttonValue.planDate"
+          type="warning"
+          style="margin-right: 10px"
+        >
+          <el-button size="mini" @click="handleQuery('planDate')"
+            >派 车</el-button
+          >
+        </el-badge></el-col
+      >
+      <el-col :span="1.5">
+        <el-badge
           :value="buttonValue.acceptDate"
           type="warning"
           style="margin-right: 10px"

src/views/warehouseBusiness/inStock/index.vue

@@ -2908,7 +2908,7 @@
               货权方：{{ form.fCorpidName }}
             </td>
             <td width="450" colspan="2" class="zzss">
-              仓库：{{ form.fWarehouseid }}
+              仓库：{{ form.fWarehouseids }}
             </td>
             <td width="450" colspan="3" class="zzss">地址：{{ fAddr }}</td>
           </tr>
@@ -5140,7 +5140,7 @@ export default {
           if (this.form.fWarehouseid === this.warehouseOptions[sorp].fId) {
             this.$set(
               this.form,
-              "fWarehouseid",
+              "fWarehouseids",
               this.warehouseOptions[sorp].fName
             );
           }
@@ -6696,6 +6696,7 @@ export default {
             }
           }
           if (dataList.length !== 0) {
+            console.log('1111:' + JSON.stringify(this.form))
             let formData = new window.FormData();
             formData.append("warehouseBills", JSON.stringify(this.form));
             formData.append("warehousebillsitems", JSON.stringify(dataList));