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

src/views/reportManagement/whgenleg/index.vue

@@ -3,30 +3,12 @@
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="仓库" prop="fwarehouseid">
         <treeselect style="width:160px"
-                    v-model="queryParams.fWarehouselocid"
+                    v-model="queryParams.fWarehouseLocationid"
                     :options="fWarehouseidOption"
                     @select="treeseLect"
                     :show-count="true"
-                    :disable-branch-nodes="true"
                     placeholder="请选择归属库区" />
       </el-form-item>
-      <el-form-item label="库区" prop="fWarehouseLocationid">
-        <el-select
-          v-model="queryParams.fWarehouseLocationid"
-          filterable
-          remote
-          size="small"
-          :remote-method="kqhouseRemoteMethod"
-          placeholder="请选择库区"
-        >
-          <el-option
-            v-for="(dict, index) in kqhouseOptions"
-            :key="index.fId"
-            :label="dict.fName"
-            :value="dict.fId"
-          ></el-option>
-        </el-select>
-      </el-form-item>
       <el-form-item label="货物名称" prop="fgoodsid">
         <el-select
           v-model="queryParams.fGoodsid"
@@ -352,7 +334,7 @@ export default {
   },
   methods: {
     treeseLect(tree){
-      this.queryParams.fWarehouselocid = tree.id
+      this.queryParams.fWarehouseLocationid = tree.id
     },
     getTreeselect() {
       treeselect().then(response => {

src/views/warehouseBusiness/inStock/index.vue

@@ -7,6 +7,7 @@
       v-show="showSearch"
       label-width="88px"
     >
+      <el-row>
         <el-form-item label="业务编号" prop="fBillno">
           <el-input
             v-model="queryParams.fBillno"
@@ -133,13 +134,23 @@
           </el-select>
         </el-form-item>
         <el-form-item label="仓库" prop="fWarehouseid">
-            <treeselect style="width:160px"
-                        v-model="queryParams.fWarehouselocid"
-                        :options="fWarehouseidOption"
-                        @select="treeseLect"
-                        :show-count="true"
-                        :disable-branch-nodes="true"
-                        placeholder="请选择归属库区" />
+          <el-select
+            v-model="queryParams.fWarehouseid"
+            filterable
+            remote
+            @select="treeseLect"
+            :disabled="browseStatus || formBrowseStatus"
+            style="width: 80%"
+            @keyup.enter.native="handleQuery"
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="(dict, index) in warehouseOptions"
+              :key="index.fId"
+              :label="dict.fName"
+              :value="dict.fId"
+            ></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="品牌" prop="fMarks">
           <el-input
@@ -2829,15 +2840,32 @@
               入库日期：{{ fBsdates }}
             </td>
           </tr>
-          <tr v-for="(item, index) in Printinglist" :key="index">
+
+<!--          <tr v-for="(item, index) in Printinglist" :key="index">-->
+<!--            <td width="200">车号</td>-->
+<!--            <td width="200">{{ item.fTruckno }}</td>-->
+<!--            <td width="200">货物品名</td>-->
+<!--            <td width="200" class="zzss">-->
+<!--              {{ item.fGoodsids }}-->
+<!--            </td>-->
+<!--            <td width="200">{{item.fBusinessTypes}}</td>-->
+<!--            <td width="200">{{item.fMarks}}</td>-->
+<!--          </tr>-->
+          <tr>
             <td width="200">车号</td>
-            <td width="200">{{ item.fTruckno }}</td>
             <td width="200">货物品名</td>
-            <td width="200" class="zzss">
-              {{ item.fGoodsids }}
-            </td>
-            <td width="200">{{item.fBusinessTypes}}</td>
-            <td width="200">{{item.fMarks}}</td>
+            <td width="200">提单号</td>
+            <td width="200">品牌/规格/产地</td>
+            <td width="200">净重(吨)</td>
+            <td width="200">件数(50KG)</td>
+          </tr>
+          <tr v-for="(item, index) in Printinglist" :key="index">
+            <td width="200">{{ item.fTruckno }}</td>
+            <td width="200">{{ item.fGoodsids }}</td>
+            <td width="200">{{ item.fMblno }}</td>
+            <td width="200">{{item.fBusinessTypes}}/{{item.fMarks}}</td>
+            <td width="200">{{item.fNetweight}}</td>
+            <td width="200">{{ item.fQty }}</td>
           </tr>
           <tr>
             <td width="1400" colspan="6">&nbsp;</td>
@@ -2985,6 +3013,7 @@ export default {
       formBrowseStatus: false,
       fTruckno: "",
       fBsdates: "",
+      fMblno:"",
       fCntrtype: "",
       fGoodsids: "",
       fPlaNnumber: "",
@@ -3309,8 +3338,10 @@ export default {
       this.fleetOptions = response.data;
     });
     treeselect().then(response => {
-      this.fWarehouseidOption = response.data
+      console.log(response)
+      this.warehouseOptions = response.data
     })
+    this.warehousesssMethod()
   },
   activated() {
     this.adoPt()
@@ -3324,6 +3355,7 @@ export default {
     },
     /** 查询部门下拉树结构 */
     treeseLect(tree){
+      console.log(tree)
       this.queryParams.fWarehouselocid = tree.id
     },
     getTreeselect(row) {
@@ -3658,13 +3690,16 @@ export default {
       }
     },
     showEditDialog_ss() {
+      console.log("000")
       if (this.Printinglist.length > 0) {
+        console.log("111")
         for (let li in this.Printinglist) {
           if (this.dataListSelection.length > 0) {
             this.fTruckno = this.dataListSelection[0].fTruckno;
             this.fCntrtype = this.dataListSelection[0].fCntrtype;
             this.fGoodsids = this.dataListSelection[0].fGoodsids;
             this.fPackagespecs = this.dataListSelection[0].fPackagespecs;
+            console.log(this.Printinglist)
             var date = new Date(this.dataListSelection[0].fBsdate);
             var Y = date.getFullYear() + "-";
             var M =
@@ -3773,11 +3808,16 @@ export default {
           }
         }
         if (this.dataListSelection.length > 0) {
+          console.log(this.dataListSelection)
           this.fTruckno = this.dataListSelection[0].fTruckno
           this.fCntrtype = this.dataListSelection[0].fCntrtype
           this.fGoodsids = this.dataListSelection[0].fGoodsids
           this.fDriverTel = this.dataListSelection[0].fDriverTel
           this.fPackagespecs = this.dataListSelection[0].fPackagespecs
+          this.fMblno = this.dataListSelection[0].fMblno
+          this.fQty = this.dataListSelection[0].fQty
+          // this.fQtys = this.dataListSelection[0].fQty
+          console.log(this.fQtys)
           var date = new Date(this.dataListSelection[0].fBsdate)
           var Y = date.getFullYear() + '-'
           var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-'
@@ -4300,7 +4340,6 @@ export default {
       this.detailsHidden = false;
       this.formBrowseStatus = false;
       const fId = row.fId || this.ids;
-      this.dataList = [];
       console.log(fId)
       this.goodsRemoteMethod()
       getWarehousebills(fId).then((response) => {

src/views/warehouseBusiness/outStock/index.vue

@@ -132,13 +132,23 @@
         </el-select>
       </el-form-item>
       <el-form-item label="仓库" prop="fWarehouseid">
-        <treeselect style="width:160px"
-                    v-model="queryParams.fWarehouselocid"
-                    :options="fWarehouseidOption"
-                    @select="treeseLect"
-                    :show-count="true"
-                    :disable-branch-nodes="true"
-                    placeholder="请选择归属库区" />
+        <el-select
+          v-model="queryParams.fWarehouseid"
+          filterable
+          remote
+          @select="treeseLect"
+          :disabled="browseStatus || formBrowseStatus"
+          style="width: 80%"
+          @keyup.enter.native="handleQuery"
+          placeholder="请选择"
+        >
+          <el-option
+            v-for="(dict, index) in warehouseOptions"
+            :key="index.fId"
+            :label="dict.fName"
+            :value="dict.fId"
+          ></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="品牌" prop="fMarks">
         <el-input
@@ -2591,13 +2601,29 @@
               出库日期：{{ fBsdate }}
             </td>
           </tr>
-          <tr v-for="(item, index) in printinglist" :key="index">
+<!--          <tr v-for="(item, index) in printinglist" :key="index">-->
+<!--            <td width="200">车号</td>-->
+<!--            <td width="200">{{ item.fTruckno }}</td>-->
+<!--            <td width="200">货物品名</td>-->
+<!--            <td width="200">{{ item.fGoodsids }}</td>-->
+<!--            <td width="200">{{item.fBusinessTypes}}</td>-->
+<!--            <td width="200">{{item.fMarks}}</td>-->
+<!--          </tr>-->
+          <tr>
             <td width="200">车号</td>
-            <td width="200">{{ item.fTruckno }}</td>
             <td width="200">货物品名</td>
+            <td width="200">提单号</td>
+            <td width="200">品牌/规格/产地</td>
+            <td width="200">净重(吨)</td>
+            <td width="200">件数(50KG)</td>
+          </tr>
+          <tr v-for="(item, index) in printinglist" :key="index">
+            <td width="200">{{ item.fTruckno }}</td>
             <td width="200">{{ item.fGoodsids }}</td>
-            <td width="200">{{item.fBusinessTypes}}</td>
-            <td width="200">{{item.fMarks}}</td>
+            <td width="200">{{ item.fMblno }}</td>
+            <td width="200">{{item.fBusinessTypes}}/{{item.fMarks}}</td>
+            <td width="200">{{item.fNetweight}}</td>
+            <td width="200">{{ item.fQty }}</td>
           </tr>
           <tr>
             <td width="1400" colspan="6">&nbsp;</td>
@@ -3013,8 +3039,9 @@ export default {
       this.fleetOptions = response.data;
     });
     treeselect().then(response => {
-      this.fWarehouseidOption = response.data
+      this.warehouseOptions = response.data
     })
+    this.warehousesssMethod()
   },
   activated() {
     this.adoPt()

src/views/warehouseBusiness/stockTransfer/index.vue

@@ -132,13 +132,23 @@
         </el-select>
       </el-form-item>
       <el-form-item label="仓库" prop="fWarehouseid">
-        <treeselect style="width:160px"
-                    v-model="queryParams.fWarehouselocid"
-                    :options="fWarehouseidOption"
-                    @select="treeseLect"
-                    :show-count="true"
-                    :disable-branch-nodes="true"
-                    placeholder="请选择归属库区" />
+        <el-select
+          v-model="queryParams.fWarehouseid"
+          filterable
+          remote
+          @select="treeseLect"
+          :disabled="browseStatus || formBrowseStatus"
+          style="width: 80%"
+          @keyup.enter.native="handleQuery"
+          placeholder="请选择"
+        >
+          <el-option
+            v-for="(dict, index) in warehouseOptions"
+            :key="index.fId"
+            :label="dict.fName"
+            :value="dict.fId"
+          ></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="品牌" prop="fMarks">
         <el-input
@@ -237,7 +247,8 @@
           <span>{{ parseTime(scope.row.fBsdate, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="仓库" align="center" prop="fWarehouseid" />
+      <el-table-column label="调入仓库" align="center" prop="fWarehouseid" />
+      <el-table-column label="调出仓库" align="center" prop="fInwarehouseid" />
       <el-table-column label="调拨件数" align="center" prop="fPlanqty" />
       <el-table-column label="调拨毛重" align="center" prop="fPlangrossweight" />
       <el-table-column label="调拨净重" align="center" prop="fPlannetweight" />
@@ -2239,15 +2250,31 @@
               调拨日期：{{ form.fBsdates }}
             </td>
           </tr>
-          <tr v-for="(item, index) in printinglist" :key="index">
+<!--          <tr v-for="(item, index) in printinglist" :key="index">-->
+<!--            <td width="200">车号</td>-->
+<!--            <td width="200">{{ item.fTruckno }}</td>-->
+<!--            <td width="200">货物品名</td>-->
+<!--            <td width="200" class="zzss">-->
+<!--              {{ item.fGoodsids }}-->
+<!--            </td>-->
+<!--            <td width="200">{{item.fBusinessTypes}}</td>-->
+<!--            <td width="200">{{item.fMarks}}</td>-->
+<!--          </tr>-->
+          <tr>
             <td width="200">车号</td>
-            <td width="200">{{ item.fTruckno }}</td>
             <td width="200">货物品名</td>
-            <td width="200" class="zzss">
-              {{ item.fGoodsids }}
-            </td>
-            <td width="200">{{item.fBusinessTypes}}</td>
-            <td width="200">{{item.fMarks}}</td>
+            <td width="200">提单号</td>
+            <td width="200">品牌/规格/产地</td>
+            <td width="200">净重(吨)</td>
+            <td width="200">件数(50KG)</td>
+          </tr>
+          <tr v-for="(item, index) in printinglist" :key="index">
+            <td width="200">{{ item.fTruckno }}</td>
+            <td width="200">{{ item.fGoodsids }}</td>
+            <td width="200">{{ item.fMblno }}</td>
+            <td width="200">{{item.fBusinessTypes}}/{{item.fMarks}}</td>
+            <td width="200">{{item.fNetweight}}</td>
+            <td width="200">{{ item.fQty }}</td>
           </tr>
           <tr>
             <td width="1400" colspan="6">&nbsp;</td>
@@ -2658,8 +2685,10 @@ export default {
       this.fleetOptions = response.data;
     });
     treeselect().then(response => {
-      this.fWarehouseidOption = response.data
+      console.log(response)
+      this.warehouseOptions = response.data
     })
+    this.warehousesssMethod()
     this.register()
   },
   activated(){
@@ -3356,7 +3385,7 @@ export default {
       this.whgenlegParams.fMblno = this.form.fMblno;
       this.whgenlegParams.fCorpid = this.form.fCorpid;
       this.whgenlegParams.fTrademodeid = this.form.fTrademodeid;
-      this.whgenlegParams.fInwarehouseid = this.form.fInwarehouseid
+      this.whgenlegParams.fWarehouseid = this.form.fInwarehouseid
       listWhgenleg(this.whgenlegParams).then((response) => {
         this.whgenlegList = response.rows;
         this.whgenlegTotal = response.total;