仓储修改

src/views/warehouseBusiness/goodsTransfer/index.vue

@@ -153,12 +153,24 @@
           v-model="queryParams.fBillstatus"
           placeholder="请输入费用状态"
         >
-          <el-option label="录入" value="1"></el-option>
+          <el-option label="保存" value="1"></el-option>
           <el-option label="暂存" value="2"></el-option>
-          <el-option label="驳回" value="3"></el-option>
-          <el-option label="请核" value="4"></el-option>
+          <el-option label="审批驳回" value="3"></el-option>
+          <el-option label="提交审核" value="4"></el-option>
           <el-option label="审核中" value="5"></el-option>
-          <el-option label="全部入账" value="6"></el-option>
+          <el-option label="审核完成" value="6"></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="货转状态" prop="fItemsStatus">
+        <el-select
+          style="width:200px"
+          v-model="queryParams.fItemsStatus"
+          placeholder="请输出库状态"
+        >
+          <el-option label="计划" value="1"/>
+          <el-option label="待货转" value="2"/>
+          <el-option label="已货转" value="6"/>
         </el-select>
       </el-form-item>
       <el-form-item label="货转日期" prop="fBsdate">

src/views/warehouseBusiness/inStock/index.vue

@@ -162,6 +162,18 @@
             <el-option label="全部入账" value="6"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="入库状态" prop="fItemsStatus">
+          <el-select
+            style="width:200px"
+            v-model="queryParams.fItemsStatus"
+            placeholder="请输入入库状态"
+          >
+            <el-option label="计划" value="1"></el-option>
+            <el-option label="待入库" value="2"></el-option>
+            <el-option label="入库中" value="3"></el-option>
+            <el-option label="已入库" value="4"></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="入库日期" prop="timeInterval">
           <el-date-picker
             v-model="queryParams.timeInterval"
@@ -176,7 +188,7 @@
           >
           </el-date-picker>
         </el-form-item>
-        <el-form-item>
+        <el-form-item style="float: right">
           <el-button
             type="cyan"
             icon="el-icon-search"
@@ -459,10 +471,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="业务时间" prop="fBsdate">
+            <el-form-item label="业务时间" prop="fBstime">
               <el-time-picker
                 style="width: 80%"
-                v-model="form.fBsdate"
+                v-model="form.fBstime"
                 :picker-options="{
                 selectableRange: '00:00:01 - 23:59:59'
               }"
@@ -3272,7 +3284,8 @@ export default {
         fFleet:null,
         fBusinessType:null,
         fItemsStatus: null,
-        fFeetunit: '2'
+        fFeetunit: '2',
+        fBstime:new Date()
       },
       // 表单校验
       rules: {
@@ -4322,7 +4335,8 @@ export default {
         fGoodsid:null,
         fWarehouseid:null,
         fMarks:null,
-        fBillstatus:null
+        fBillstatus:null,
+        fItemsStatus:null
       }
       this.resetForm("queryForm");
       this.handleQuery();
@@ -4383,7 +4397,7 @@ export default {
       this.form = {
         fItemsStatus: null,
         fFeetunit:"2",
-        // fBsdate:new Date()
+        fBstime:new Date()
       }
       this.browseStatus = status;
       this.queryUser();

src/views/warehouseBusiness/outStock/index.vue

@@ -161,7 +161,19 @@
           <el-option label="全部入账" value="6"></el-option>
         </el-select>
       </el-form-item>
-        <el-form-item label="出库日期" prop="timeInterval">
+      <el-form-item label="出库状态" prop="fItemsStatus">
+        <el-select
+          style="width:200px"
+          v-model="queryParams.fItemsStatus"
+          placeholder="请输出库状态"
+        >
+          <el-option label="计划" value="1"/>
+          <el-option label="卸货中" value="2"/>
+          <el-option label="已装货" value="3"/>
+          <el-option label="已出库" value="4"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="出库日期" prop="timeInterval">
           <el-date-picker
             v-model="queryParams.timeInterval"
             type="daterange"
@@ -440,10 +452,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="业务时间" prop="fBsdate">
+            <el-form-item label="业务时间" prop="fBstime">
               <el-time-picker
                 style="width: 80%"
-                v-model="form.fBsdate"
+                v-model="form.fBstime"
                 :picker-options="{
                 selectableRange: '00:00:01 - 23:59:59'
               }"
@@ -452,7 +464,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="车辆类型" prop="fBsdate">
+            <el-form-item label="车辆类型" prop="fCartype">
               <el-select style="width: 80%" v-model="form.fCartype">
                 <el-option
                   v-for="(dict, index) in fCartypeOptions"
@@ -3011,7 +3023,8 @@ export default {
         fTrademodeid: null,
         fWarehouseid: null,
         fBusinessType: null,
-        fCartype:''
+        fCartype: 0,
+        fBstime:new Date()
       },
       // 表单校验
       rules: {
@@ -4218,6 +4231,7 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd(status) {
+
       this.reset();
       this.browseStatus = status;
       this.queryUser();
@@ -4230,7 +4244,11 @@ export default {
       this.relevantAttachments = [];
       this.title = "出库单";
       this.formBrowseStatus = false;
-      this.form.fFeetunit = "2"
+      this.form = {
+        fFeetunit:'2',
+        fCartype:'0',
+        fBstime:new Date()
+      }
       this.contrOl = false
     },
     /** 修改按钮操作 */

src/views/warehouseBusiness/stockTransfer/index.vue

@@ -161,6 +161,18 @@
           <el-option label="全部入账" value="6"></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="调拨状态" prop="fItemsStatus">
+        <el-select
+          style="width:200px"
+          v-model="queryParams.fItemsStatus"
+          placeholder="请输出库状态"
+        >
+          <el-option label="计划" value="1"/>
+          <el-option label="待调拨" value="2"/>
+          <el-option label="调拨中" value="3"/>
+          <el-option label="已调拨" value="4"/>
+        </el-select>
+      </el-form-item>
       <el-form-item label="调拨日期" prop="timeInterval">
         <el-date-picker
           v-model="queryParams.timeInterval"
@@ -428,6 +440,19 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
+            <el-form-item label="业务时间" prop="fBstime">
+              <el-time-picker
+                style="width: 80%"
+                v-model="form.fBstime"
+                :picker-options="{
+                selectableRange: '00:00:01 - 23:59:59'
+              }"
+                placeholder="任意时间点">
+              </el-time-picker>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
             <el-form-item label="仓管员" prop="fStorekeeper">
               <el-select
                 v-model="form.fStorekeeper"
@@ -841,6 +866,15 @@
               >撤回调拨
               </el-button
               >
+              <el-button size="small" type="success" :disabled="browseStatus" prop="打印"
+              >打印吊牌
+              </el-button>
+              <el-button size="small" type="success" :disabled="browseStatus" prop="打印" @click="showEditDialog_ss"
+              >收货单
+              </el-button>
+              <el-button size="small" type="warning" :disabled="browseStatus" prop="打印" @click="showEditDialog_s"
+              >入库单
+              </el-button>
               <el-button
                 style="background-color: #008000; color: #fff"
                 @click="submitForm"
@@ -2635,6 +2669,7 @@ export default {
         fBsdates: null,
         fTrademodeid: null,
         fWarehouseid: null,
+        fBstime:new Date()
       },
       // 表单校验
       rules: {
@@ -3610,6 +3645,9 @@ export default {
       this.relevantAttachments = [];
       this.title = "调拨单";
       this.formBrowseStatus = false;
+      this.form = {
+        fBstime:new Date()
+      }
     },
     check_s(row,status){
       // this.disappear = true

src/views/warehouseBusiness/storageFeeCalculation/index.vue

@@ -74,20 +74,21 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="费用状态" prop="fBillstatus">
+      <el-form-item label="单据状态" prop="fBillstatus">
         <el-select
           style="width:200px"
           v-model="queryParams.fBillstatus"
-          placeholder="请输入费用状态"
+          placeholder="请输入单据状态"
         >
-          <el-option label="录入" value="1"></el-option>
+          <el-option label="新建" value="1"></el-option>
           <el-option label="暂存" value="2"></el-option>
-          <el-option label="驳回" value="3"></el-option>
-          <el-option label="请核" value="4"></el-option>
+          <el-option label="审核驳回" value="3"></el-option>
+          <el-option label="提交审核" value="4"></el-option>
           <el-option label="审核中" value="5"></el-option>
-          <el-option label="全部入账" value="6"></el-option>
+          <el-option label="审核通过" value="6"></el-option>
         </el-select>
       </el-form-item>
+
       <el-form-item label="出库日期" prop="timeInterval">
         <el-date-picker
           v-model="queryParams.timeInterval"