Browse Source

修改 入库 添加入库确认 修改 出库 货转 库存总账细节

阿伏兔 4 years ago
parent
commit
c45a74cdcc

+ 10 - 1
src/api/warehouseBusiness/warehouseInStock.js

@@ -26,6 +26,15 @@ export function addWarehousebills(data) {
   })
 }
 
+// 入库详情信息入账
+export function addWhgenleg(data) {
+  return request({
+    url: '/warehouseBusiness/inStock/addCredit',
+    method: 'post',
+    data: data
+  })
+}
+
 // 修改仓库主(出入库)
 export function updateWarehousebills(data) {
   return request({
@@ -50,4 +59,4 @@ export function exportWarehousebills(query) {
     method: 'get',
     params: query
   })
-}
+}

+ 4 - 44
src/views/reportManagement/whgenleg/index.vue

@@ -133,8 +133,7 @@
           type="primary"
           icon="el-icon-plus"
           size="mini"
-          :disabled="multiple"
-          @click="handleAdd"
+          disabled
           v-hasPermi="['warehouseBusiness:whgenleg:add']"
         >新增</el-button>
       </el-col>
@@ -143,8 +142,7 @@
           type="success"
           icon="el-icon-edit"
           size="mini"
-          :disabled="single"
-          @click="handleUpdate"
+          disabled
           v-hasPermi="['warehouseBusiness:whgenleg:edit']"
         >修改</el-button>
       </el-col>
@@ -153,8 +151,7 @@
           type="danger"
           icon="el-icon-delete"
           size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
+          disabled
           v-hasPermi="['warehouseBusiness:whgenleg:remove']"
         >删除</el-button>
       </el-col>
@@ -170,8 +167,7 @@
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="whgenlegList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+    <el-table v-loading="loading" :data="whgenlegList">
       <el-table-column label="客户" align="center" prop="fCorpid" />
       <el-table-column label="提单号" align="center" prop="fMblno" />
       <el-table-column label="库区" align="center" prop="fWarehouseLocationids" />
@@ -322,12 +318,6 @@ export default {
       kqhouseOptions: [],
       // 遮罩层
       loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
       // 显示搜索条件
       showSearch: true,
       // 总条数
@@ -495,28 +485,12 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.fAccyear)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
       this.open = true;
       this.title = "添加库存总账";
     },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const fAccyear = row.fAccyear || this.ids
-      getWhgenleg(fAccyear).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改库存总账";
-      });
-    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
@@ -537,20 +511,6 @@ export default {
         }
       });
     },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const fAccyears = row.fAccyear || this.ids;
-      this.$confirm('是否确认删除库存总账编号为"' + fAccyears + '"的数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delWhgenleg(fAccyears);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        })
-    },
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;

+ 151 - 104
src/views/warehouseBusiness/inStock/index.vue

@@ -303,7 +303,7 @@
                 v-model="form.fCorpid"
                 filterable
                 remote
-                :disabled="browseStatus"
+                :disabled="creditStatus"
                 style="width: 250px"
                 :remote-method="corpsRemoteMethod"
                 placeholder="请选择货权方"
@@ -323,7 +323,7 @@
                 v-model="form.fStltypeid"
                 placeholder="请选择结算方式"
                 clearable
-                :disabled="browseStatus"
+                :disabled="creditStatus"
                 style="width: 250px"
               >
                 <el-option
@@ -339,7 +339,7 @@
             <el-form-item label="提单号" prop="fMblno">
               <el-input
                 v-model="form.fMblno"
-                :disabled="browseStatus"
+                :disabled="creditStatus"
                 style="width: 250px"
                 placeholder="手工输入"
               />
@@ -353,7 +353,7 @@
                 v-model="form.fBsdate"
                 style="width: 250px"
                 type="date"
-                :disabled="browseStatus"
+                :disabled="creditStatus"
                 @change="changefBsdate"
                 value-format="timestamp"
                 placeholder="业务日期"
@@ -368,7 +368,7 @@
                 v-model="form.fStorekeeper"
                 filterable
                 remote
-                :disabled="browseStatus"
+                :disabled="creditStatus"
                 style="width: 250px"
                 :remote-method="userRemoteMethod"
                 placeholder="请选择仓管员"
@@ -387,7 +387,7 @@
               <el-select
                 v-model="form.fWarehouseid"
                 filterable
-                :disabled="browseStatus"
+                :disabled="creditStatus"
                 remote
                 style="width: 250px"
                 :remote-method="warehouseRemoteMethod"
@@ -421,7 +421,7 @@
                 v-model="form.fIfdamage"
                 placeholder="请选择是否破损"
                 clearable
-                :disabled="browseStatus"
+                :disabled="creditStatus"
                 style="width: 250px"
               >
                 <el-option
@@ -439,7 +439,7 @@
                 v-model="form.fIfweigh"
                 placeholder="请选择是否过磅"
                 clearable
-                :disabled="browseStatus"
+                :disabled="creditStatus"
                 style="width: 250px"
               >
                 <el-option
@@ -460,7 +460,7 @@
                 v-model="form.fIfpledge"
                 placeholder="请选择是否过磅"
                 clearable
-                :disabled="browseStatus"
+                :disabled="creditStatus"
                 style="width: 250px"
               >
                 <el-option
@@ -477,7 +477,7 @@
               <el-input
                 v-model="form.fBankcorpid"
                 laceholder="质押银行"
-                :disabled="browseStatus"
+                :disabled="creditStatus"
                 style="width: 250px"
               />
             </el-form-item>
@@ -488,7 +488,7 @@
                 v-model="form.fFeetunit"
                 placeholder="请选择计费单位"
                 clearable
-                :disabled="browseStatus"
+                :disabled="creditStatus"
                 style="width: 250px"
               >
                 <el-option
@@ -507,7 +507,7 @@
               style="width: 100%"
               v-model="form.remark"
               type="textarea"
-              :disabled="browseStatus"
+              :disabled="creditStatus"
               placeholder="请输入内容"
             />
           </el-form-item>
@@ -526,7 +526,7 @@
                 <el-input
                   v-model="form.fContacts"
                   style="width: 250px"
-                  :disabled="browseStatus"
+                  :disabled="creditStatus"
                   placeholder="仓库联系人"
                 />
               </el-form-item>
@@ -535,7 +535,7 @@
               <el-form-item label="仓库电话" prop="fTel">
                 <el-input
                   v-model="form.fTel"
-                  :disabled="browseStatus"
+                  :disabled="creditStatus"
                   style="width: 250px"
                   placeholder="请输仓库入电话"
                 />
@@ -546,7 +546,7 @@
                 <el-input
                   v-model="form.fVslvoy"
                   style="width: 250px"
-                  :disabled="browseStatus"
+                  :disabled="creditStatus"
                   placeholder="船名航次"
                 />
               </el-form-item>
@@ -559,7 +559,7 @@
                   v-model="form.fEta"
                   style="width: 250px"
                   type="date"
-                  :disabled="browseStatus"
+                  :disabled="creditStatus"
                   value-format="timestamp"
                   placeholder="到港日期"
                 >
@@ -571,7 +571,7 @@
                 <el-input
                   v-model="form.fCustomno"
                   style="width: 250px"
-                  :disabled="browseStatus"
+                  :disabled="creditStatus"
                   laceholder="报关单号"
                 />
               </el-form-item>
@@ -583,7 +583,7 @@
                   v-model="form.fSbu"
                   filterable
                   remote
-                  :disabled="browseStatus"
+                  :disabled="creditStatus"
                   :remote-method="fSbuRemoteMethod"
                   style="width: 250px"
                   placeholder="请选择经营单位"
@@ -614,7 +614,7 @@
                 <el-select
                   v-model="form.fTrademodeid"
                   placeholder="请选择贸易方式"
-                  :disabled="browseStatus"
+                  :disabled="creditStatus"
                   clearable
                   style="width: 250px"
                 >
@@ -676,7 +676,7 @@
                 <el-input
                   v-model="form.fMarks"
                   style="width: 250px"
-                  :disabled="browseStatus"
+                  :disabled="creditStatus"
                   placeholder="唛头"
                 />
               </el-form-item>
@@ -690,6 +690,9 @@
         <el-button :disabled="browseStatus" @click.prevent="addRelevant()"
           >添加
         </el-button>
+        <el-button :disabled="dataListSelection.length <= 0" @click.prevent="creditClick()"
+          >入库确认
+        </el-button>
       </div>
       <el-table
         :data="dataList"
@@ -698,9 +701,17 @@
         border
         stripe
         :summary-method="getSummaries"
+        @selection-change="dataListChange"
         show-summary
       >
-        <el-table-column label="序号" type="index" width="80">
+        <el-table-column
+        type="selection"
+        width="55">
+        </el-table-column>
+        <el-table-column
+          label="序号"
+          type="index"
+          width="80">
         </el-table-column>
         <el-table-column
           prop="fBsdate"
@@ -714,7 +725,7 @@
               v-model="scope.row.fBsdate"
               style="width: 150px"
               type="date"
-              :disabled="browseStatus"
+              :disabled="scope.row.fBillstatus === '7'"
               value-format="timestamp"
               placeholder="入库日期"
             >
@@ -731,9 +742,9 @@
           <template slot-scope="scope">
             <el-select
               v-model="scope.row.fGoodsid"
-              filterable
-              :disabled="browseStatus"
               remote
+              filterable
+              :disabled="scope.row.fBillstatus === '7'"
               :remote-method="goodsRemoteMethod"
               placeholder="请选择品名"
             >
@@ -756,9 +767,9 @@
           <template slot-scope="scope">
             <el-input
               oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
+              :disabled="scope.row.fBillstatus === '7'"
               v-model="scope.row.fCntrtype"
               placeholder="箱型"
-              :disabled="browseStatus"
               show-word-limit
             />
           </template>
@@ -772,10 +783,10 @@
         >
           <template slot-scope="scope">
             <el-input
-              oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
+              oninput='this.value=this.value.replace(/[^\-?\d]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "")'
+              :disabled="scope.row.fBillstatus === '7'"
               v-model="scope.row.fCntqty"
               placeholder="箱量"
-              :disabled="browseStatus"
               show-word-limit
             />
           </template>
@@ -790,9 +801,9 @@
           <template slot-scope="scope">
             <el-input
               oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, "$1$2.$3")'
+              :disabled="scope.row.fBillstatus === '7'"
               v-model="scope.row.fPlangrossweight"
               placeholder="计划毛重"
-              :disabled="browseStatus"
               show-word-limit
             />
           </template>
@@ -807,8 +818,8 @@
           <template slot-scope="scope">
             <el-input
               oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, "$1$2.$3")'
+              :disabled="scope.row.fBillstatus === '7'"
               v-model="scope.row.fPlannetweight"
-              :disabled="browseStatus"
               placeholder="计划净重"
               show-word-limit
             />
@@ -824,9 +835,9 @@
           <template slot-scope="scope">
             <el-input
               oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, "$1$2.$3")'
+              :disabled="scope.row.fBillstatus === '7'"
               v-model="scope.row.fPlanvolumn"
               placeholder="尺码"
-              :disabled="browseStatus"
               show-word-limit
             />
           </template>
@@ -841,9 +852,9 @@
           <template slot-scope="scope">
             <el-input
               oninput='this.value=this.value.replace(/[^\-?\d]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "")'
+              :disabled="scope.row.fBillstatus === '7'"
               v-model="scope.row.fPlanqty"
               placeholder="件数"
-              :disabled="browseStatus"
               show-word-limit
             />
           </template>
@@ -858,9 +869,9 @@
           <template slot-scope="scope">
             <el-input
               oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, "$1$2.$3")'
+              :disabled="scope.row.fBillstatus === '7'"
               v-model="scope.row.fGrossweight"
               placeholder="入库毛重"
-              :disabled="browseStatus"
               show-word-limit
             />
           </template>
@@ -875,9 +886,9 @@
           <template slot-scope="scope">
             <el-input
               oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, "$1$2.$3")'
+              :disabled="scope.row.fBillstatus === '7'"
               v-model="scope.row.fNetweight"
               placeholder="入库净重"
-              :disabled="browseStatus"
               show-word-limit
             />
           </template>
@@ -892,9 +903,9 @@
           <template slot-scope="scope">
             <el-input
               oninput='this.value=this.value.replace(/[^\-?\d]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "")'
+              :disabled="scope.row.fBillstatus === '7'"
               v-model="scope.row.fQty"
               placeholder="入库件数"
-              :disabled="browseStatus"
               show-word-limit
             />
           </template>
@@ -909,9 +920,9 @@
           <template slot-scope="scope">
             <el-input
               oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, "$1$2.$3")'
+              :disabled="scope.row.fBillstatus === '7'"
               v-model="scope.row.fVolumn"
               placeholder="入库尺码"
-              :disabled="browseStatus"
               show-word-limit
             />
           </template>
@@ -926,9 +937,9 @@
           <template slot-scope="scope">
             <el-input
               oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, "$1$2.$3")'
+              :disabled="scope.row.fBillstatus === '7'"
               v-model="scope.row.fPackagespecs"
               placeholder="包装规格"
-              :disabled="browseStatus"
               show-word-limit
             />
           </template>
@@ -945,8 +956,8 @@
               v-model="scope.row.fWarehouselocid"
               filterable
               remote
-              :disabled="browseStatus"
               :remote-method="kqhouseRemoteMethod"
+              :disabled="scope.row.fBillstatus === '7'"
               placeholder="请选择库区"
             >
               <el-option
@@ -969,8 +980,8 @@
             <el-input
               v-model="scope.row.fCntrno"
               placeholder="箱号"
-              :disabled="browseStatus"
               show-word-limit
+              :disabled="scope.row.fBillstatus === '7'"
             />
           </template>
         </el-table-column>
@@ -984,9 +995,9 @@
           <template slot-scope="scope">
             <el-input
               oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, "$1$2.$3")'
+              :disabled="scope.row.fBillstatus === '7'"
               v-model="scope.row.fGoodsval"
               placeholder="货值"
-              :disabled="browseStatus"
               show-word-limit
             />
           </template>
@@ -1001,9 +1012,9 @@
           <template slot-scope="scope">
             <el-input
               oninput="value=value.replace(/[^\d.]/g,'')"
+              :disabled="scope.row.fBillstatus === '7'"
               v-model="scope.row.fTruckno"
               placeholder="车号"
-              :disabled="browseStatus"
               show-word-limit
             />
           </template>
@@ -1017,9 +1028,9 @@
         >
           <template slot-scope="scope">
             <el-input
+              :disabled="scope.row.fBillstatus === '7'"
               v-model="scope.row.remark"
               placeholder="备注"
-              :disabled="browseStatus"
               show-word-limit
             />
           </template>
@@ -1032,7 +1043,7 @@
         >
           <template slot-scope="scope">
             <el-button
-              :disabled="browseStatus"
+              :disabled="scope.row.fBillstatus === '7'"
               @click.native.prevent="deleteRow(scope.$index, dataList)"
               size="small"
               >移除</el-button
@@ -1585,7 +1596,7 @@
           >入库单
         </el-button>
         <el-button v-if="!browseStatus" type="primary" @click="submitForm(2)">暂 存</el-button>
-        <el-button v-if="!browseStatus" type="primary" @click="submitForm(6)">提 交</el-button>
+        <el-button v-if="!browseStatus" type="primary" @click="submitForm(6)">费用提交</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
       <el-dialog
@@ -1859,10 +1870,11 @@
 <script>
 import print from "print-js";
 import {
-  listWarehousebills,
+  addWhgenleg,
   getWarehousebills,
   delWarehousebills,
   addWarehousebills,
+  listWarehousebills,
   updateWarehousebills,
   exportWarehousebills,
 } from "@/api/warehouseBusiness/warehouseInStock";
@@ -1889,16 +1901,15 @@ export default {
       // 修改查看状态
       browseStatus: false,
       detailsHidden: false,
-      fPlangrossweight: "",
-      fPlannetweight: "",
-      fPlanvolumn: "",
-      fPlanqty: "",
-      fFeeUnitid: "",
-      fFeeUnitids: "",
-      fGrossweight: "",
-      fCntqty: "",
-      fNetweight: "",
-      fQty: "",
+      fPlannetweight: null,
+      fPlanvolumn: null,
+      fPlanqty: null,
+      fFeeUnitid: null,
+      fFeeUnitids: null,
+      fGrossweight: null,
+      fCntqty: null,
+      fNetweight: null,
+      fQty: null,
       fPlangrossweight: 0,
       // 遮罩层
       loading: true,
@@ -1910,6 +1921,7 @@ export default {
         deptId: null,
       },
       queryForm: {},
+      creditStatus: false,
       // 添加用户对话框
       editDialogVisible_s: false,
       editDialogVisible_ss: false,
@@ -1937,6 +1949,8 @@ export default {
       // 货权方(客户数据)
       // 客户名称
       KHblnoOptions: [],
+      // 库存明细入账数组
+      dataListSelection: [],
       fSbuOptions: [],
       // 操作员
       userOptions: [],
@@ -2138,6 +2152,7 @@ export default {
         fPlanqty: 0,
         fGrossweight: 0,
         fQty: 0,
+        fBillstatus: null,
         fPackagespecs: null,
         fWarehouselocid: null,
         fBoxno: null,
@@ -2355,6 +2370,12 @@ export default {
          }
          if(response.data.warehouseBillsItem) {
            this.dataList = response.data.warehouseBillsItem;
+           for (let list in this.dataList) {
+             if (!this.creditStatus && this.dataList[list].fBillstatus === '7') {
+               this.creditStatus = true
+             }
+             this.$set(this.dataList[list], "fBsdate", Date.parse(this.dataList[list].fBsdate));
+           }
          }
          if(response.data.enclosures) {
            this.relevantAttachments = response.data.enclosures;
@@ -2364,13 +2385,7 @@ export default {
         this.$set(this.form, "createTime", Date.parse(this.form.createTime));
         this.$set(this.form, "fTrademodeid", this.form.fTrademodeid + "");
 
-        for (let list in this.dataList) {
-          this.$set(
-            this.dataList[list],
-            "fBsdate",
-            Date.parse(this.dataList[list].fBsdate)
-          );
-        }
+
         this.goodsOptions = response.data.goodsList;
         this.kqhouseOptions = response.data.warehouseAreas;
         this.warehouseDrList = response.data.warehousebillsfeesDr;
@@ -2395,6 +2410,11 @@ export default {
         this.title = "修改仓入库)";
       });
     },
+    // 库存明细多选框结果
+    dataListChange (row) {
+      console.log(JSON.stringify(row))
+      this.dataListSelection = row
+    },
     // 合计
     getSummaries(param) {
       const { columns, data } = param;
@@ -2534,55 +2554,82 @@ export default {
         this.$set(row, "fQty", this.fGrossweight);
       }
       if (row.fUnitprice) {
-        this.$set(
-          row,
-          "fAmount",
-          parseFloat(Number(row.fUnitprice) * Number(row.fQty)).toFixed(2)
-        );
+        this.$set(row, "fAmount", parseFloat(Number(row.fUnitprice) * Number(row.fQty)).toFixed(2))
       }
     },
+    // 入账
+    creditClick () {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          let formData = new window.FormData();
+          formData.append("warehouseBills", JSON.stringify(this.form))
+          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) {
+                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', '7')
+                }
+              }
+            }
+          })
+        }
+      })
+      console.log('有东西')
+    },
     /** 提交按钮 */
     submitForm(status) {
       this.$refs["form"].validate((valid) => {
-        if(status === 2) {
+        if (status === 2) {
           if (valid) {
-          this.form.fBillstatus = status;
-          this.form.fNetweight = this.fNetweight;
-          this.form.fPlangrossweight = this.fPlangrossweight;
-          this.form.fPlannetweight = this.fPlannetweight;
-          this.form.fPlanvolumn = this.fPlanvolumn;
-          this.form.fPlanqty = this.fPlanqty;
-          this.form.fGrossweight = this.fGrossweight;
-          this.form.fQty = this.fQty;
-          let formData = new window.FormData();
-          // 附件数据
-          formData.append("tWarehouseBills", JSON.stringify(this.form));
-          // 库存明细
-          formData.append(
-            "tWarehousebillsitems",
-            JSON.stringify(this.dataList)
-          );
-          // 附件数据
-          formData.append(
-            "tWhgenleg",
-            JSON.stringify(this.relevantAttachments)
-          );
-          // 费用明细付款
-          formData.append(
-            "tWarehousebillsfeesCr",
-            JSON.stringify(this.warehouseCrList)
-          );
-          // 收款
-          formData.append(
-            "tWarehousebillsfeesDr",
-            JSON.stringify(this.warehouseDrList)
-          );
-          addWarehousebills(formData).then((response) => {
-            this.msgSuccess("提交成功");
-            this.open = false;
-            this.getList();
-          });
-        }
+            if (!this.form.fBillstatus) {
+              this.form.fBillstatus = status;
+            }
+            this.form.fNetweight = this.fNetweight;
+            this.form.fPlangrossweight = this.fPlangrossweight;
+            this.form.fPlannetweight = this.fPlannetweight;
+            this.form.fPlanvolumn = this.fPlanvolumn;
+            this.form.fPlanqty = this.fPlanqty;
+            this.form.fGrossweight = this.fGrossweight;
+            this.form.fQty = this.fQty;
+            let formData = new window.FormData();
+            // 附件数据
+            formData.append("tWarehouseBills", JSON.stringify(this.form));
+            // 库存明细
+            formData.append(
+              "tWarehousebillsitems",
+              JSON.stringify(this.dataList)
+            );
+            // 附件数据
+            formData.append(
+              "tWhgenleg",
+              JSON.stringify(this.relevantAttachments)
+            );
+            // 费用明细付款
+            formData.append(
+              "tWarehousebillsfeesCr",
+              JSON.stringify(this.warehouseCrList)
+            );
+            // 收款
+            formData.append(
+              "tWarehousebillsfeesDr",
+              JSON.stringify(this.warehouseDrList)
+            );
+            addWarehousebills(formData).then((response) => {
+              this.msgSuccess("提交成功");
+              this.open = false;
+              this.getList();
+            });
+          }
 
       }else {
         if (this.dataList.length === 0) {

+ 4 - 4
src/views/warehouseBusiness/outStock/index.vue

@@ -832,7 +832,7 @@
         >
           <template slot-scope="scope">
             <el-input
-              oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
+              oninput='this.value=this.value.replace(/[^\-?\d]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "")'
               v-model="scope.row.fQty"
               :disabled="browseStatus"
               placeholder="出库件数"
@@ -849,7 +849,7 @@
         >
           <template slot-scope="scope">
             <el-input
-              oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
+              oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, "$1$2.$3")'
               v-model="scope.row.fVolumn"
               :disabled="browseStatus"
               placeholder="出库尺码"
@@ -866,7 +866,7 @@
         >
           <template slot-scope="scope">
             <el-input
-              oninput="value=value.replace(/[^\d.]/g,'')"
+              oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
               v-model="scope.row.fPackagespecs"
               :disabled="browseStatus"
               placeholder="包装规格"
@@ -925,7 +925,7 @@
         >
           <template slot-scope="scope">
             <el-input
-              oninput="value=value.replace(/[^\d.]/g,'')"
+              oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d\d).*$/, "$1$2.$3")'
               v-model="scope.row.fGoodsval"
               placeholder="货值"
               :disabled="browseStatus"