优化出库页面

src/views/warehouseBusiness/outStock/index.vue

@@ -197,17 +197,6 @@
           >修改
         </el-button>
       </el-col>
-      <!-- <el-col :span="1.5">
-        <el-button
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['warehouseBusiness:warehousebills:remove']"
-          >删除
-        </el-button>
-      </el-col> -->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -234,7 +223,6 @@
         @queryTable="getList"
       ></right-toolbar>
     </el-row>
-
     <el-table
       v-loading="loading"
       :data="warehousebillsList"
@@ -259,17 +247,9 @@
           <span>{{ parseTime(scope.row.fBsdate, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <!-- <el-table-column
-        label="贸易方式"
-        align="center"
-        prop="fTrademodeid"
-        :formatter="fTrademodeidFormat"
-      /> -->
       <el-table-column label="仓库" align="center" prop="fWarehouseid" />
-
+      <el-table-column label="计划出库件数" align="center" prop="fPlanqty" />
       <el-table-column label="出库件数" align="center" prop="fQty" />
-      <!--      <el-table-column label="入库毛重" align="center" prop="fGrossweight"/>-->
-      <!-- <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
@@ -516,46 +496,41 @@
         </el-row>
         <el-row>
           <el-col :span="8">
-            <el-form-item label="质押" prop="fifpledge">
-              <el-select
-                v-model="form.fIfpledge"
-                placeholder="请选择是否过磅"
-                :disabled="browseStatus || formBrowseStatus"
-                clearable
+            <el-form-item label="计划件数" prop="fPlanqty">
+              <el-input
+                v-model="form.fPlanqty"
                 style="width: 80%"
-              >
-                <el-option
-                  v-for="dict in fIfpledgeOptions"
-                  :key="dict.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
-                />
-              </el-select>
+                laceholder="计划件数"
+                oninput='this.value=this.value.replace(/\D/g,"")'
+                :disabled="browseStatus"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="质押银行" prop="fbankcorpid">
-              <el-select
-                v-model="queryParams.fBankcorpid"
-                filterable
-                remote
-                clearable
+            <el-form-item label="计划净重" prop="fPlannetweight">
+              <el-input
+                v-model="form.fPlannetweight"
                 style="width: 80%"
-                :disabled="browseStatus || formBrowseStatus"
-                @keyup.enter.native="handleQuery"
-                :remote-method="corpsRemoteMethodd"
-                placeholder="请输入模糊查找"
-              >
-                <el-option
-                  v-for="(dict, index) in Pledgebank"
-                  :key="index.fId"
-                  :label="dict.fName"
-                  :value="dict.fId"
-                ></el-option>
-              </el-select>
+                oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
+                laceholder="计划毛重"
+                :disabled="browseStatus"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="8">
+            <el-form-item label="计划毛重" prop="fPlangrossweight">
+              <el-input
+                v-model="form.fPlangrossweight"
+                oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
+                style="width: 80%"
+                laceholder="计划毛重"
+                :disabled="browseStatus"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
             <el-form-item label="计费单位" prop="fFeetunit">
               <el-select
                 v-model="form.fFeetunit"
@@ -618,41 +593,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="船名航次" prop="fvslvoy">
-                <el-input
-                  v-model="form.fVslvoy"
-                  :disabled="browseStatus || formBrowseStatus"
-                  style="width: 80%"
-                  placeholder="船名航次"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="8">
-              <el-form-item label="到港日期" prop="feta">
-                <el-date-picker
-                  v-model="form.fEta"
-                  style="width: 80%"
-                  type="date"
-                  :disabled="browseStatus || formBrowseStatus"
-                  value-format="timestamp"
-                  placeholder="到港日期"
-                >
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="报关单号" prop="fcustomno">
-                <el-input
-                  v-model="form.fCustomno"
-                  style="width: 80%"
-                  :disabled="browseStatus || formBrowseStatus"
-                  laceholder="报关单号"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
               <el-form-item label="贸易方式" prop="fTrademodeid">
                 <el-select
                   v-model="form.fTrademodeid"
@@ -755,7 +695,7 @@
           <!-- <el-button type="primary" :disabled="browseStatus" @click="saveForm">保 存</el-button> -->
           <el-button
             style="background-color: #008000; color: #fff"
-            @click="submitForm(6)"
+            @click="submitForm"
             :disabled="browseStatus"
             >请核</el-button
           >
@@ -2243,14 +2183,12 @@ import {
   getWarehousebills,
   delWarehousebills,
   addWarehousebills,
-  warehouseSubmission,
-  updateWarehousebills,
-  exportWarehousebills,
-} from "@/api/warehouseBusiness/warehouseOutStock";
-import {
   updateCredit,
   addJoblist,
   disChargelist,
+  warehouseSubmission,
+  updateWarehousebills,
+  exportWarehousebills,
 } from "@/api/warehouseBusiness/warehouseOutStock";
 import { listAgreement, operationAgreement } from "@/api/agreement/agreement";
 
@@ -2356,7 +2294,6 @@ export default {
       KHblnoOptions: [],
       // 作业费协议
       tasklegList: [],
-      Pledgebank: [],
       fSbuOptions: [],
       // 操作员
       userOptions: [],
@@ -2382,8 +2319,6 @@ export default {
       fStltypeOptions: [],
       // 是否过磅(数据字典)默认 F ,过磅T 否者F 下拉选择字典
       fIfweighOptions: [],
-      // 是否质押(数据字典),默认 F ,质押T 否者F 下拉选择字典
-      fIfpledgeOptions: [],
       // 是否破损(数据字典),默认F否则T字典
       fIfdamageOptions: [],
       // 单据类型(数据字典)SJRK字典
@@ -2466,21 +2401,16 @@ export default {
       rules: {
         fDeptid: [{ required: true, message: " ", trigger: "blur" }],
         fBsdeptid: [{ required: true, message: " ", trigger: "blur" }],
-        fCorpid: [
-          {
-            required: true,
-            message: " ",
-            trigger: "blur",
-          },
-        ],
-        fMarks: [{ required: true, message: " ", trigger: "blur" }],
-
+        fCorpid: [{ required: true, message: " ", trigger: "blur"},],
+        fPlanqty: [{ required: true, message: " ", trigger: "blur"},],
+        fPlannetweight: [{ required: true, message: " ", trigger: "blur"},],
         fFeeUnitid: [{ required: true, message: " ", trigger: "blur" }],
         fChargedate: [{ required: true, message: " ", trigger: "blur" }],
         fBillingway: [{ required: true, message: " ", trigger: "blur" }],
         fBsdate: [{ required: true, message: " ", trigger: "blur" }],
         fTrademodeid: [{ required: true, message: " ", trigger: "blur" }],
         fSbu: [{ required: true, message: " ", trigger: "blur" }],
+        fPlangrossweight: [{ required: true, message: " ", trigger: "blur"},],
         fStorekeeper: {
           required: true,
           message: " ",
@@ -2521,9 +2451,6 @@ export default {
     this.getDicts("data_ifweigh_status").then((response) => {
       this.fIfweighOptions = response.data;
     });
-    this.getDicts("data_ifpledge_status").then((response) => {
-      this.fIfpledgeOptions = response.data;
-    });
     this.getDicts("data_ifdamage_status").then((response) => {
       this.fIfdamageOptions = response.data;
     });
@@ -2745,15 +2672,15 @@ export default {
     },
     // 新增list
     addRelevant() {
-      if (!this.form.fCorpid || !this.form.fTrademodeid || !this.form.fWarehouseid) {
-        this.$message({ message: "请维护货权方、仓库、贸易方式", type: "warning", });
-        return false;
-      }
-      this.whgenlegList = [];
-      this.dialogWhgenlegList = [];
-      this.whgenlegTotal = 0;
-      this.whgenlegVisible = true;
-      this.getWhgenlegList();
+      this.$refs['form'].validate((valid) => {
+        if (valid) {
+          this.whgenlegList = [];
+          this.dialogWhgenlegList = [];
+          this.whgenlegTotal = 0;
+          this.whgenlegVisible = true;
+          this.getWhgenlegList();
+        }
+      })
     },
     // 库存总账导出数据
     whgenlegData() {
@@ -3013,10 +2940,6 @@ export default {
     fIfweighFormat(row, column) {
       return this.selectDictLabel(this.fIfweighOptions, row.fIfweigh);
     },
-    // 是否质押(数据字典),默认 F ,质押T 否者F 下拉选择字典翻译
-    fIfpledgeFormat(row, column) {
-      return this.selectDictLabel(this.fIfpledgeOptions, row.fIfpledge);
-    },
     // 是否破损(数据字典),默认F否则T字典翻译
     fIfdamageFormat(row, column) {
       return this.selectDictLabel(this.fIfdamageOptions, row.fIfdamage);
@@ -3805,16 +3728,6 @@ export default {
         this.kqhouseOptions = response.rows;
       });
     },
-    /* 远程模糊查询质押银行 */
-    corpsRemoteMethodd(name) {
-      if (name == null || name === "") {
-        return false;
-      }
-      let queryParams = { pageNum: 1, pageSize: 10, fName: name, type: 5 };
-      listCorps(queryParams).then((response) => {
-        this.Pledgebank = response.rows;
-      });
-    },
     /* 远程模糊查询操作用户 */
     userRemoteMethod(name) {
       if (name == null || name === "") {