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

src/views/Warehousing/goodsTransfer/AddOrUpdate.vue

@@ -252,10 +252,9 @@
               placeholder="请输入关键词"
               style="width: 80%"
               @change="changePrint"
-              :disabled="browseStatus || form.warehouseStatus > 3"
             >
               <el-option
-                v-for="(item, index) in fMblnoOptions"
+                v-for="(item, index) in battributionList"
                 :key="index.fId"
                 :label="item.fName"
                 :value="item.fId"
@@ -2193,6 +2192,7 @@ export default {
       fCompanyOptIons: [],
       fleetOptions: [],
       fFeetUnitOptions: [],
+      battributionList: [],
       current: "",
       before: "",
       contrOl: false,
@@ -2659,6 +2659,9 @@ export default {
     listCorps({ fTypeid: 2 }).then((response) => {
       this.fleetOptions = response.rows;
     });
+    listCorps({fTypeid: 7}).then((response) => {
+      this.battributionList = response.rows;
+    });
     this.getDicts("unload_mode").then((response) => {
       this.unloadModes = response.data;
     });

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -560,10 +560,9 @@
                     placeholder="请输入关键词"
                     style="width: 80%"
                     @change="changePrint"
-                    :disabled="browseStatus || form.warehouseStatus > 3"
                   >
                     <el-option
-                      v-for="(item, index) in fMblnoOptions"
+                      v-for="(item, index) in battributionList"
                       :key="index.fId"
                       :label="item.fName"
                       :value="item.fId"
@@ -2184,7 +2183,7 @@
                 {{ item.fGrossweight }}
               </td>
               <td v-else></td>
-              <td>{{ item.fPlanqty }}</td>
+              <td>{{ item.fQty }}</td>
               <td v-if="item.fNetweight && radio == 1">
                 {{ (item.fNetweight / 1000).toFixed(4) }}
               </td>

src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -441,10 +441,9 @@
                   placeholder="请输入关键词"
                   style="width: 80%"
                   @change="changePrint"
-                  :disabled="browseStatus || form.warehouseStatus > 3"
                 >
                   <el-option
-                    v-for="(item, index) in fMblnoOptions"
+                    v-for="(item, index) in battributionList"
                     :key="index.fId"
                     :label="item.fName"
                     :value="item.fId"
@@ -4778,6 +4777,7 @@ export default {
         fTel: '',
         fTax: '',
       },
+      battributionList: [],
     };
   },
   computed: {
@@ -4881,6 +4881,9 @@ export default {
     listCorps({fTypeid: 2}).then((response) => {
       this.fleetOptions = response.rows;
     });
+    listCorps({fTypeid: 7}).then((response) => {
+      this.battributionList = response.rows;
+    });
     this.getDicts("unload_mode").then((response) => {
       this.unloadModes = response.data;
     });

src/views/Warehousing/stockTransfer/AddOrUpdate.vue

@@ -484,10 +484,9 @@
                   placeholder="请输入关键词"
                   style="width: 80%"
                   @change="changePrint"
-                  :disabled="browseStatus || form.warehouseStatus > 3"
                 >
                   <el-option
-                    v-for="(item, index) in fMblnoOptions"
+                    v-for="(item, index) in battributionList"
                     :key="index.fId"
                     :label="item.fName"
                     :value="item.fId"
@@ -2651,7 +2650,7 @@
                 {{ item.fGrossweight }}
               </td>
               <td v-else></td>
-              <td>{{ item.fPlanqty }}</td>
+              <td>{{ item.fQty }}</td>
               <td v-if="item.fNetweight && radio == 1">
                 {{ (item.fNetweight / 1000).toFixed(4) }}
               </td>
@@ -4191,6 +4190,7 @@ export default {
         fTel: '',
         fTax: '',
       },
+      battributionList: [],
     };
   },
   created() {
@@ -4271,6 +4271,9 @@ export default {
     listCorps({ fTypeid: 2 }).then((response) => {
       this.fleetOptions = response.rows;
     });
+    listCorps({fTypeid: 7}).then((response) => {
+      this.battributionList = response.rows;
+    });
     this.getConfigKey("outStock.orders.approvalFlow").then((response) => {
       this.showApproval = response.msg;
     });

src/views/reportManagement/whgenleg/index.vue

@@ -5,7 +5,7 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
+      label-width="76px"
     >
       <el-form-item label="客户" prop="fCorpid">
         <el-select
@@ -149,7 +149,7 @@
             size="small"
         />
       </el-form-item>
-      <el-form-item label="显示库存" prop="isMblno">
+      <el-form-item label="显示0库存" prop="isMblno">
         <el-select
           v-model="queryParams.isMblno"
           filterable

src/views/warehouseBusiness/warehouseCheck/index.vue

@@ -101,33 +101,33 @@
               :height="tableHeight">
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="序号" type="index" width="50" fixed align="center"/>
-      <el-table-column label="仓库名称" align="center" prop="fWarehouseName"/>
-      <el-table-column label="巡检人" align="center" prop="fInspectorName"/>
-      <el-table-column label="巡检计划日期起" align="center" prop="fInspectorBeginDatetime" width="180">
+      <el-table-column label="仓库名称" align="center" prop="fWarehouseName" width="280" show-overflow-tooltip/>
+      <el-table-column label="巡检人" align="center" prop="fInspectorName" show-overflow-tooltip/>
+      <el-table-column label="巡检计划日期起" align="center" prop="fInspectorBeginDatetime" width="180" show-overflow-tooltip>
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.fInspectorBeginDatetime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="巡检计划日期止" align="center" prop="fInspectorEndDatetime" width="180">
+      <el-table-column label="巡检计划日期止" align="center" prop="fInspectorEndDatetime" width="180" show-overflow-tooltip>
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.fInspectorEndDatetime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="制单人" align="center" prop="fCreateByName"/>
-      <el-table-column label="制单日期" align="center" prop="fCreateTime" width="180">
+      <el-table-column label="制单人" align="center" prop="fCreateByName" show-overflow-tooltip/>
+      <el-table-column label="制单日期" align="center" prop="fCreateTime" width="180" show-overflow-tooltip>
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.fCreateTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="更新人" align="center" prop="fUpdateByName"/>
-      <el-table-column label="最新时间" align="center" prop="fUpdateTime" width="180">
+      <el-table-column label="更新人" align="center" prop="fUpdateByName" show-overflow-tooltip/>
+      <el-table-column label="最新时间" align="center" prop="fUpdateTime" width="180" show-overflow-tooltip>
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.fUpdateTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="系统编号" align="center" prop="fSystemNo"/>
-      <el-table-column label="备注" align="center" prop="fRemark"/>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160">
+      <el-table-column label="系统编号" align="center" prop="fSystemNo" show-overflow-tooltip/>
+      <el-table-column label="备注" align="center" prop="fRemark" show-overflow-tooltip/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160" fixed="right">
         <template slot-scope="scope">
           <el-button
               size="mini"