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

src/views/basicdata/fleet/companyMsg-add-or-update.vue

@@ -371,7 +371,6 @@ export default {
           console.log(valid)
           preservation(this.dataForm_s).then(data=>{
             this.$message.success('操作成功');
-
           })
         }
       })

src/views/reportManagement/Statistics/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="仓库" prop="fwarehouseid">
-        <treeselect style="width:200px"
+        <treeselect style="width:160px"
                     v-model="queryParams.fWarehouseid"
                     :options="fWarehouseidOption"
                     @select="treeseLect"
@@ -17,7 +17,6 @@
           remote
           clearable
           size="small"
-          style="width:200px"
           :remote-method="goodsRemoteMethod"
           @keyup.enter.native="handleQuery"
           placeholder="请选择货物名称"
@@ -30,12 +29,25 @@
           ></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="业务日期" prop="timeInterval">
+        <el-date-picker
+          v-model="queryParams.timeInterval"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          clearable
+          style="width: 60%"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          @keyup.enter.native="handleQuery"
+        >
+        </el-date-picker>
+      </el-form-item>
       <el-form-item label="贸易方式" prop="fTrademodeid">
         <el-select
           v-model="queryParams.fTrademodeid"
           placeholder="请选择贸易方式"
           clearable
-          style="width:200px"
           size="small"
           @keyup.enter.native="handleQuery"
         >
@@ -54,7 +66,6 @@
           remote
           clearable
           size="small"
-          style="width:200px"
           @keyup.enter.native="handleQuery"
           :remote-method="corpsRemoteMethod"
           placeholder="请选择货权方"
@@ -72,7 +83,6 @@
           v-model="queryParams.fMblno"
           placeholder="请输入提单号"
           clearable
-          style="width:200px"
           size="small"
           @keyup.enter.native="handleQuery"
         />
@@ -91,7 +101,6 @@
           v-model="queryParams.fBilltype"
           placeholder="请选择出库/入库"
           clearable
-          style="width:200px"
           size="small"
           @keyup.enter.native="handleQuery"
         >
@@ -103,20 +112,6 @@
 
         </el-select>
       </el-form-item>
-      <el-form-item label="业务日期" prop="timeInterval">
-        <el-date-picker
-          v-model="queryParams.timeInterval"
-          type="daterange"
-          value-format="yyyy-MM-dd"
-          clearable
-          style="width:280px"
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          @keyup.enter.native="handleQuery"
-        >
-        </el-date-picker>
-      </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>

src/views/warehouseBusiness/inStock/index.vue

@@ -354,8 +354,13 @@
 
 <!--      <el-table-column  label="制单人" align="center" prop="createBy" fixed/>-->
 <!--      <el-table-column-->
-<!--        label="仓管员"-->
-<!--        width="100"-->
+<!--        v-for="(item, index) in getRowList"-->
+<!--        :key="index"-->
+<!--        :label="item.name"-->
+<!--        :width="item.width"-->
+<!--        :fixed="item.fixed"-->
+<!--        :prop="item.label"-->
+<!--        sortable-->
 <!--        align="center"-->
 <!--        prop="fStorekeeper"-->
 <!--        fixed/>-->
@@ -3686,8 +3691,7 @@ export default {
         fTocorpid: [{ required: true, message: " ", trigger: "blur", },],
         fGoodsid: [{ required: true, message: " ", trigger: "blur", },],
       },
-      defaultTitle:[],
-      fStorekeeper:''
+      defaultTitle:[]
     };
   },
   created() {
@@ -4511,8 +4515,8 @@ export default {
           pageNum:1,
           pageSize:10,
           fTaskType:Number(fTaskType),
-          fFleet:this.form.fFleet,
-          fBilltype:'SJRK'
+          fFleet:this.form.fFleet
+
         }
       }else {
         this.Navigation = false
@@ -4520,7 +4524,7 @@ export default {
         data = {
           pageNum:1,
           pageSize:10,
-          fCorpid:this.form.fCorpid,
+          fCorpid:this.form.fCorpid
         }
       }
       operationAgreement(data).then( response => {