修改出库、货转库界面细节

src/views/warehouseBusiness/goodsTransfer/index.vue

@@ -2007,7 +2007,6 @@ export default {
           formData.append("warehousebillsitems", JSON.stringify(this.dataListSelection))
           formData.append("whgenleg", JSON.stringify(this.relevantAttachments))
           addWhgenleg(formData).then((response) => {
-            this.creditStatus = true
             this.msgSuccess("入账成功");
             for (let li in this.dataListSelection) {
               for (let i in this.dataList) {
@@ -2022,10 +2021,10 @@ export default {
                 }
               }
             }
+            this.$refs.table.clearSelection();
           })
         }
       })
-      console.log('有东西')
     },
     // 付款合计
     warehouseDrSummaries (param) {
@@ -2206,8 +2205,8 @@ export default {
       }
       // 净重 fPlannetweight
       // 毛重 fPlangrossweight
-      let netweight = parseFloat(Number(row.fPlannetweight) / Number(row.fQtyblc)).toFixed(6)
-      let grossweigh = parseFloat(Number(row.fPlangrossweight) / Number(row.fQtyblc)).toFixed(6)
+      let netweight = parseFloat(Number(row.fPlannetweight) / Number(row.fPlanqty)).toFixed(6)
+      let grossweigh = parseFloat(Number(row.fPlangrossweight) / Number(row.fPlanqty)).toFixed(6)
       this.$set(row, 'fNetweight', parseFloat(Number(netweight) * Number(row.fQty)).toFixed(6))
       this.$set(row, 'fGrossweight', parseFloat(Number(grossweigh) * Number(row.fQty)).toFixed(6))
     },

src/views/warehouseBusiness/inStock/index.vue

@@ -2843,6 +2843,7 @@ export default {
           formData.append("whgenleg", JSON.stringify(this.relevantAttachments))
           addWhgenleg(formData).then((response) => {
             this.fid = response.data;
+            this.formBrowseStatus = true
             this.msgSuccess("入账成功");
             this.$refs.table.clearSelection();
             for (let li in this.dataListSelection) {

src/views/warehouseBusiness/outStock/index.vue

@@ -273,9 +273,31 @@
       <!-- <el-table-column label="货转客户名称" align="center" prop="fTocorpid" /> -->
       <el-table-column label="出库毛重" align="center" prop="fGrossweight" />
       <el-table-column label="净重" align="center" prop="fNetweight" />
-      <el-table-column width="150" label="费用状态" align="center" prop="fBillstatus" />
-      <el-table-column width="150" label="入库状态" align="center" prop="fItemsStatus" />
-
+      <el-table-column
+        width="100"
+        label="入库状态"
+        align="center"
+        prop="fItemsStatus">
+        <template slot-scope="scope">
+          <span v-if="scope.row.fItemsStatus === '1'">未入账</span>
+          <span v-if="scope.row.fItemsStatus === '2'">部分入账</span>
+          <span v-if="scope.row.fItemsStatus === '6'">全部入账</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        width="100"
+        label="费用状态"
+        align="center"
+        prop="fBillstatus">
+        <template slot-scope="scope">
+          <span v-if="scope.row.fBillstatus === '1'">录入</span>
+          <span v-if="scope.row.fBillstatus === '2'">录入</span>
+          <span v-if="scope.row.fBillstatus === '3'">驳回</span>
+          <span v-if="scope.row.fBillstatus === '4'">请核</span>
+          <span v-if="scope.row.fBillstatus === '5'">审核中</span>
+          <span v-if="scope.row.fBillstatus === '6'">全部入账</span>
+        </template>
+      </el-table-column>
       <el-table-column
         label="操作"
         align="center"
@@ -296,7 +318,7 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
-            v-if="scope.row.fBillstatus !== '6'"
+            v-if="scope.row.fBillstatus === '1' || scope.row.fBillstatus === '2' || scope.row.fBillstatus === '3'"
             @click="handleUpdate(scope.row, false)"
             v-hasPermi="['warehouseBusiness:warehousebills:edit']"
             >修改
@@ -306,7 +328,7 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-if="scope.row.fBillstatus !== '6'"
+            v-if="scope.row.fBillstatus !== '6' && scope.row.fItemsStatus === '1'"
             v-hasPermi="['warehouseBusiness:warehousebills:remove']"
             >删除
           </el-button>
@@ -336,7 +358,7 @@
                 v-model="form.fCorpid"
                 filterable
                 remote
-                :disabled="browseStatus"
+                :disabled="browseStatus || formBrowseStatus"
                 @change="changefCorpid(form)"
                 style="width: 80%"
                 :remote-method="corpsRemoteMethod"
@@ -356,7 +378,7 @@
               <el-select
                 v-model="form.fStltypeid"
                 placeholder="请选择结算方式"
-                :disabled="browseStatus"
+                :disabled="browseStatus || formBrowseStatus"
                 clearable
                 style="width: 80%"
               >
@@ -374,7 +396,7 @@
               <el-input
                 v-model="form.fMblno"
                 style="width: 80%"
-                :disabled="browseStatus"
+                :disabled="browseStatus || formBrowseStatus"
                 placeholder="手工输入"
               />
             </el-form-item>
@@ -387,7 +409,7 @@
                 v-model="form.fBsdate"
                 style="width: 80%"
                 type="date"
-                :disabled="browseStatus"
+                :disabled="browseStatus || formBrowseStatus"
                 @change="changefBsdate"
                 value-format="timestamp"
                 placeholder="业务日期"
@@ -402,7 +424,7 @@
                 v-model="form.fStorekeeper"
                 filterable
                 remote
-                :disabled="browseStatus"
+                :disabled="browseStatus || formBrowseStatus"
                 style="width: 80%"
                 :remote-method="userRemoteMethod"
                 placeholder="请输入模糊查找"
@@ -422,7 +444,7 @@
                 v-model="form.fWarehouseid"
                 filterable
                 remote
-                :disabled="browseStatus"
+                :disabled="browseStatus || formBrowseStatus"
                 style="width: 80%"
                 :remote-method="warehouseRemoteMethod"
                 placeholder="请输入模糊查找"
@@ -454,7 +476,7 @@
               <el-select
                 v-model="form.fIfdamage"
                 placeholder="请选择是否破损"
-                :disabled="browseStatus"
+                :disabled="browseStatus || formBrowseStatus"
                 clearable
                 style="width: 80%"
               >
@@ -472,7 +494,7 @@
               <el-select
                 v-model="form.fIfweigh"
                 placeholder="请选择是否过磅"
-                :disabled="browseStatus"
+                :disabled="browseStatus || formBrowseStatus"
                 clearable
                 style="width: 80%"
               >
@@ -493,7 +515,7 @@
               <el-select
                 v-model="form.fIfpledge"
                 placeholder="请选择是否过磅"
-                :disabled="browseStatus"
+                :disabled="browseStatus || formBrowseStatus"
                 clearable
                 style="width: 80%"
               >
@@ -514,6 +536,7 @@
                 remote
                 clearable
                 style="width: 80%"
+                :disabled="browseStatus || formBrowseStatus"
                 @keyup.enter.native="handleQuery"
                 :remote-method="corpsRemoteMethodd"
                 placeholder="请输入模糊查找"
@@ -532,7 +555,7 @@
               <el-select
                 v-model="form.fFeetunit"
                 placeholder="请选择计费单位"
-                :disabled="browseStatus"
+                :disabled="browseStatus || formBrowseStatus"
                 clearable
                 style="width: 80%"
               >
@@ -550,7 +573,7 @@
               <el-input
                 v-model="form.fMarks"
                 style="width: 80%"
-                :disabled="browseStatus"
+                :disabled="browseStatus || formBrowseStatus"
                 placeholder="唛头"
               />
             </el-form-item>
@@ -561,19 +584,20 @@
             <el-input
               style="width: 100%"
               v-model="form.remark"
-              :disabled="browseStatus"
+              :disabled="browseStatus || formBrowseStatus"
               type="textarea"
               placeholder="请输入内容"
             />
           </el-form-item>
         </el-row>
-       
+
         <div v-if="detailsHidden">
           <el-row style="margin-top: 30px">
             <el-col :span="8">
               <el-form-item label="仓库联系人" prop="fContacts">
                 <el-input
                   v-model="form.fContacts"
+                  :disabled="browseStatus || formBrowseStatus"
                   style="width: 80%"
                   placeholder="仓库联系人"
                 />
@@ -583,7 +607,7 @@
               <el-form-item label="仓库电话" prop="ftel">
                 <el-input
                   v-model="form.fTel"
-                  :disabled="browseStatus"
+                  :disabled="browseStatus || formBrowseStatus"
                   style="width: 80%"
                   placeholder="请输仓库入电话"
                 />
@@ -593,7 +617,7 @@
               <el-form-item label="船名航次" prop="fvslvoy">
                 <el-input
                   v-model="form.fVslvoy"
-                  :disabled="browseStatus"
+                  :disabled="browseStatus || formBrowseStatus"
                   style="width: 80%"
                   placeholder="船名航次"
                 />
@@ -607,7 +631,7 @@
                   v-model="form.fEta"
                   style="width: 80%"
                   type="date"
-                  :disabled="browseStatus"
+                  :disabled="browseStatus || formBrowseStatus"
                   value-format="timestamp"
                   placeholder="到港日期"
                 >
@@ -619,7 +643,7 @@
                 <el-input
                   v-model="form.fCustomno"
                   style="width: 80%"
-                  :disabled="browseStatus"
+                  :disabled="browseStatus || formBrowseStatus"
                   laceholder="报关单号"
                 />
               </el-form-item>
@@ -631,7 +655,7 @@
                   v-model="form.fSbu"
                   filterable
                   remote
-                  :disabled="browseStatus"
+                  :disabled="browseStatus || formBrowseStatus"
                   :remote-method="fSbuRemoteMethod"
                   style="width: 80%"
                   placeholder="请选择经营单位"
@@ -662,7 +686,7 @@
                 <el-select
                   v-model="form.fTrademodeid"
                   placeholder="请选择贸易方式"
-                  :disabled="browseStatus"
+                  :disabled="browseStatus || formBrowseStatus"
                   clearable
                   style="width: 80%"
                 >
@@ -731,7 +755,7 @@
         <el-button
           :disabled="dataListSelection.length <= 0"
           @click.prevent="creditClick()"
-          >入库确认
+          >出库确认
         </el-button>
         <!-- <el-button :disabled="browseStatus" @click.prevent="deleteRow(warehouseDrList)"
           >删除
@@ -758,7 +782,7 @@
       </div>
       <el-table
         :data="dataList"
-        ref="table"
+        ref="tableList"
         tooltip-effect="dark"
         border
         stripe
@@ -811,7 +835,7 @@
           </template>
         </el-table-column>
         <el-table-column
-          prop="fwarehouselocid"
+          prop="fWarehouselocids"
           header-align="center"
           width="150px"
           align="center"
@@ -819,7 +843,7 @@
         >
           <template slot-scope="scope">
             <el-select
-              v-model="scope.row.fWarehouselocid"
+              v-model="scope.row.fWarehouselocids"
               filterable
               remote
               disabled
@@ -837,7 +861,7 @@
           </template>
         </el-table-column>
         <el-table-column
-          prop="fcntrtype"
+          prop="fCntrtype"
           header-align="center"
           align="center"
           width="140px"
@@ -871,7 +895,7 @@
           </template>
         </el-table-column>
         <el-table-column
-          prop="fQtyblc"
+          prop="fPlanqty"
           header-align="center"
           align="center"
           width="180px"
@@ -952,7 +976,7 @@
           header-align="center"
           width="180px"
           align="center"
-          label="包装规格"
+          label="*包装规格"
         >
           <template slot-scope="scope">
             <el-input
@@ -1039,12 +1063,8 @@
           label="状态"
         >
           <template slot-scope="scope">
-            <el-input
-              v-model="scope.row.fBillstatus"
-              placeholder="状态"
-              :disabled="browseStatus || scope.row.fBillstatus === '6'"
-              show-word-limit
-            />
+            <span v-if="scope.row.fBillstatus === '6'">已出库</span>
+            <span v-if="scope.row.fBillstatus !== '6'">未出库</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -1057,6 +1077,7 @@
             <el-button
               @click.native.prevent="deleteRow(scope.$index, dataList)"
               size="small"
+              :disabled="browseStatus || scope.row.fBillstatus === '6'"
               >移除</el-button
             >
           </template>
@@ -2104,7 +2125,7 @@ export default {
     return {
       fFeeUnitid: "",
       fFeeUnitids: "",
-      browseStatus: false,
+      formBrowseStatus: false,
       detailsHidden: false,
       fGrossweight: "",
       fNetweight: "",
@@ -2391,17 +2412,19 @@ export default {
           fMblno: this.dialogWhgenlegList[whgen].fMblno,
           fGoodsid: this.dialogWhgenlegList[whgen].fGoodsid,
           fCntrtype: null,
-          fQtyblc: this.dialogWhgenlegList[whgen].fQtyblc,
-          fNetweightblc: this.dialogWhgenlegList[whgen].fNetweightblc,
-          fGrossweightblc: this.dialogWhgenlegList[whgen].fGrossweightblc,
+          fPlanqty: this.dialogWhgenlegList[whgen].fQtyblc,
+          fPlannetweight: this.dialogWhgenlegList[whgen].fNetweightblc,
+          fPlangrossweight: this.dialogWhgenlegList[whgen].fGrossweightblc,
           fWarehouseLocationids: this.dialogWhgenlegList[whgen].fWarehouseLocationids,
           fGoodsids: this.dialogWhgenlegList[whgen].fGoodsids,
           fGrossweight: 0,
           fNetweight: 0,
           fQty: 0,
           fCntqty: 1,
+          fBillstatus: 1,
           fPackagespecs: null,
           fWarehouselocid: this.dialogWhgenlegList[whgen].fWarehouseLocationid,
+          fWarehouselocids: this.dialogWhgenlegList[whgen].fWarehouseLocationids,
           fCntrno: this.dialogWhgenlegList[whgen].fCntrno,
           fGoodsval: null,
           fTruckno: null,
@@ -2473,29 +2496,6 @@ export default {
       this.loading = true;
       listWarehousebills(this.queryParams).then((response) => {
         this.warehousebillsList = response.rows;
-        for (let li in this.warehousebillsList) {
-          if(this.warehousebillsList[li].fItemsStatus === '6') {
-              this.warehousebillsList[li].fItemsStatus = "全部入账"
-              // this.browseStatus = true;
-          } else if(this.warehousebillsList[li].fItemsStatus === '1') {
-            this.warehousebillsList[li].fItemsStatus = "录入"
-          } else {
-            this.warehousebillsList[li].fItemsStatus = "部分入账"
-          }
-          if (this.warehousebillsList[li].fBillstatus === '6') {
-              this.warehousebillsList[li].fBillstatus = "审核通过"
-          } else if(this.warehousebillsList[li].fBillstatus === '3') {
-            this.warehousebillsList[li].fBillstatus = "驳回"
-          }else if(this.warehousebillsList[li].fBillstatus === '4') {
-            this.warehousebillsList[li].fBillstatus = "请核"
-          }
-          else if(this.warehousebillsList[li].fBillstatus === '2') {
-            this.warehousebillsList[li].fBillstatus = "录入"
-          }else if(this.warehousebillsList[li].fBillstatus === '5') {
-            this.warehousebillsList[li].fBillstatus = "驳回"
-          }
-        }
-        console.log(response.rows);
         this.total = response.total;
         this.loading = false;
       });
@@ -2618,7 +2618,8 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.fId);
+      this.ids = selection;
+      // this.ids = selection.map((item) => item.fId);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -2642,16 +2643,20 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row, status) {
       this.browseStatus = status;
-      console.log(this.dataList)
       this.reset();
       this.detailsHidden = false;
-      const fId = row.fId || this.ids;
-      getWarehousebills(fId).then((response) => {
+      let data = row || this.ids;
+      getWarehousebills(data.fId).then((response) => {
         if (response.data.warehousebills) {
           this.form = response.data.warehousebills;
           this.$set(this.form, "fEta", Date.parse(this.form.fEta));
           this.$set(this.form, "fStltypeid", this.form.fStltypeid + "");
           this.$set(this.form, "fTrademodeid", this.form.fTrademodeid + "");
+          if (this.form.fItemsStatus !== '1') {
+            this.formBrowseStatus = true
+          } else {
+            this.formBrowseStatus = false
+          }
         }
         if (response.data.corps) {
           this.fMblnoOptions = response.data.corps;
@@ -2670,21 +2675,8 @@ export default {
             if (!this.form.fMblno) {
               this.$set(this.form, "fMblno", this.dataList[list].fMblno);
             }
-            this.$set(
-              this.dataList[list],
-              "fGoodsids",
-              this.dataList[list].fGoodsid
-            );
-            this.$set(
-              this.dataList[list],
-              "fBsdate",
-              Date.parse(this.dataList[list].fBsdate)
-            );
-            if(this.dataList[list].fBillstatus === '6'){
-           this.$set(this.dataList[list], "fBillstatus", '已入账');
-         } else {
-           this.$set(this.dataList[list], "fBillstatus", '未入账');
-         }
+            this.$set(this.dataList[list], "fGoodsids", this.dataList[list].fGoodsid);
+            this.$set(this.dataList[list], "fBsdate", Date.parse(this.dataList[list].fBsdate));
           }
         }
         if (response.data.enclosures) {
@@ -2889,63 +2881,44 @@ export default {
               return false;
             }
             if (!this.dataListSelection[warehouseCr].fQty) {
-              this.$message.error("入库件数");
+              this.$message.error("请维护出库件数");
               return false;
             }
             if (!this.dataListSelection[warehouseCr].fPackagespecs) {
-              this.$message.error("入库件数");
+              this.$message.error("请维护包装规格");
               return false;
             }
           }
         if (valid) {
           let formData = new window.FormData();
           formData.append("warehouseBills", JSON.stringify(this.form));
-          formData.append(
-            "warehousebillsitems",
-            JSON.stringify(this.dataListSelection)
-          );
+          formData.append("warehousebillsitems", JSON.stringify(this.dataListSelection));
           formData.append("whgenleg", JSON.stringify(this.relevantAttachments));
           addWhgenleg(formData).then((response) => {
-            console.log(response);
             this.fid = response.data;
-            console.log(response.data)
-            this.creditStatus = true;
-            this.msgSuccess("入账成功");
+            this.msgSuccess("出库成功");
+            this.formBrowseStatus = true
             for (let li in this.dataListSelection) {
               for (let i in this.dataList) {
-                let fQty =
-                  this.dataList[i].fQty === this.dataListSelection[li].fQty;
-                let fBsdate =
-                  this.dataList[i].fBsdate ===
-                  this.dataListSelection[li].fBsdate;
-                let fGoodsid =
-                  this.dataList[i].fGoodsid ===
-                  this.dataListSelection[li].fGoodsid;
-                let fcntrtype =
-                  this.dataList[i].fcntrtype ===
-                  this.dataListSelection[li].fcntrtype;
-                let fNetweight =
-                  this.dataList[i].fNetweight ===
-                  this.dataListSelection[li].fNetweight;
-                let fGrossweight =
-                  this.dataList[i].fGrossweight ===
-                  this.dataListSelection[li].fGrossweight;
-                if (
-                  fBsdate &&
-                  fGoodsid &&
-                  fcntrtype &&
-                  fGrossweight &&
-                  fNetweight &&
-                  fQty
-                ) {
-                  this.$set(this.dataList[i], "fBillstatus", "6");
+                let fQty = this.dataList[i].fQty === this.dataListSelection[li].fQty;
+                let fMblno = this.dataList[i].fMblno === this.dataListSelection[li].fMblno;
+                let fBillstatus = this.dataList[i].fBillstatus === this.dataListSelection[li].fBillstatus;
+                let fPackagespecs = this.dataList[i].fPackagespecs === this.dataListSelection[li].fPackagespecs;
+                let fWarehouselocid = this.dataList[i].fWarehouselocid === this.dataListSelection[li].fWarehouselocid;
+                let fGoodsid = this.dataList[i].fGoodsid === this.dataListSelection[li].fGoodsid;
+                let fNetweight = this.dataList[i].fNetweight === this.dataListSelection[li].fNetweight;
+                let fGrossweight = this.dataList[i].fGrossweight === this.dataListSelection[li].fGrossweight;
+                alert(fQty + fMblno + fBillstatus + fPackagespecs + fWarehouselocid + fGoodsid + fNetweight + fGrossweight)
+                if (fMblno && fGoodsid && fBillstatus && fPackagespecs && fWarehouselocid && fGrossweight && fNetweight && fQty) {
+                  this.$set(this.dataList[i], 'fBillstatus', '6');
                 }
               }
             }
+            this.$refs.tableList.clearSelection();
           });
         }
       });
-      console.log("有东西");
+      console.log("有东西:" + JSON.stringify(this.dataList));
     },
     // 付款信息计价单位合计
     getwarehouseCrList(param) {
@@ -2969,14 +2942,21 @@ export default {
     },
     // 库存明细多选
     Selectinventory(selection) {
-      console.log(selection);
-      this.Printinglist = selection;
-      this.dataListSelection = selection;
-      if (this.Printinglist.length > 0) {
-        this.fTruckno = selection[0].fTruckno;
-        this.fBsdate = new Date(selection[0].fBsdate);
-        this.fCntrtype = selection[0].fCntrtype;
-        this.fGoodsids = selection[0].fGoodsids;
+      this.dataListSelection = []
+      if (!selection || selection.length === 0) {
+        return false
+      } else {
+        for (let se in selection) {
+          if (!selection[se].fBillstatus || selection[se].fBillstatus !== '6') {
+            this.dataListSelection.push(selection[se]);
+          }
+        }
+        if (this.dataListSelection.length > 0) {
+          this.fTruckno = selection[0].fTruckno;
+          this.fBsdate =  new Date(selection[0].fBsdate)
+          this.fCntrtype = selection[0].fCntrtype;
+          this.fGoodsids = selection[0].fGoodsids;
+        }
       }
     },
     // 计价单位选择
@@ -3148,7 +3128,7 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const fIds = row.fId || this.ids;
+      const fIds = row.fId || this.ids.fId;
       this.$confirm(
         '是否确认删除仓库主(出入库)编号为"' + fIds + '"的数据项?',
         "警告",
@@ -3188,10 +3168,10 @@ export default {
         this.$set(row, 'fGrossweight', 0)
         return false
       }
-      // 净重 fNetweightblc
-      // 毛重 fGrossweightblc
-      let netweight = parseFloat(Number(row.fNetweightblc) / Number(row.fQtyblc)).toFixed(6)
-      let grossweigh = parseFloat(Number(row.fGrossweightblc) / Number(row.fQtyblc)).toFixed(6)
+      // 净重 fPlannetweight
+      // 毛重 fPlangrossweight
+      let netweight = parseFloat(Number(row.fPlannetweight) / Number(row.fPlanqty)).toFixed(6)
+      let grossweigh = parseFloat(Number(row.fPlangrossweight) / Number(row.fPlanqty)).toFixed(6)
       this.$set(row, 'fNetweight', parseFloat(Number(netweight) * Number(row.fQty)).toFixed(6))
       this.$set(row, 'fGrossweight', parseFloat(Number(grossweigh) * Number(row.fQty)).toFixed(6))
     },