Pārlūkot izejas kodu

调整入库界面界面

阿伏兔 4 gadi atpakaļ
vecāks
revīzija
e57fbe8f85
1 mainītis faili ar 570 papildinājumiem un 605 dzēšanām
  1. 570 605
      src/views/warehouseBusiness/inStock/index.vue

+ 570 - 605
src/views/warehouseBusiness/inStock/index.vue

@@ -84,7 +84,7 @@
       </el-form-item>
       <el-form-item label="货物名称" prop="fGoodsid">
         <el-select v-model="queryParams.fGoodsid" placeholder="请选择货物名称" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
+          <el-option label="请选择字典生成" value=""/>
         </el-select>
       </el-form-item>
       <el-form-item label="箱型" prop="fCntrtype">
@@ -94,7 +94,7 @@
           clearable
           size="small"
         >
-          <el-option label="请选择字典生成" value="" />
+          <el-option label="请选择字典生成" value=""/>
         </el-select>
       </el-form-item>
       <el-form-item label="箱量" prop="fCntqty">
@@ -121,10 +121,12 @@
           icon="el-icon-search"
           size="mini"
           @click="handleQuery"
-          >搜索</el-button
+        >搜索
+        </el-button
         >
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-          >重置</el-button
+        >重置
+        </el-button
         >
       </el-form-item>
     </el-form>
@@ -137,7 +139,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['warehouseBusiness:warehousebills:add']"
-          >新增</el-button
+        >新增
+        </el-button
         >
       </el-col>
       <el-col :span="1.5">
@@ -148,7 +151,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['warehouseBusiness:warehousebills:edit']"
-          >修改</el-button
+        >修改
+        </el-button
         >
       </el-col>
       <el-col :span="1.5">
@@ -159,7 +163,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['warehouseBusiness:warehousebills:remove']"
-          >删除</el-button
+        >删除
+        </el-button
         >
       </el-col>
       <el-col :span="1.5">
@@ -169,7 +174,8 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['warehouseBusiness:warehousebills:export']"
-          >导出</el-button
+        >导出
+        </el-button
         >
       </el-col>
       <right-toolbar
@@ -183,47 +189,36 @@
       :data="warehousebillsList"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column v-if="false" align="center" prop="fId" />
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column type="index" label="序号" align="center"/>
       <el-table-column label="入库日期" align="center" prop="fBsdate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.fBsdate, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-            <el-table-column
-        label="件数"
+      <el-table-column
+        label="入库件数"
         align="center"
         prop="fQty"
       />
       <el-table-column
-        label="毛重"
+        label="入库毛重"
         align="center"
         prop="fGrossweight"
       />
       <el-table-column
-        label="净重"
-        align="center"
-        prop="fNetweight"
-      />
-      <el-table-column
-        label="状态"
-        align="center"
-        prop="fBillstatus"
-        :formatter="fBillstatusFormat"
-      />
-            <el-table-column
         label="是否质押"
         align="center"
         prop="fIfpledge"
         :formatter="fIfpledgeFormat"
       />
       <el-table-column
-        label="银行名称"
+        label="质押银行"
         align="center"
         prop="fBankcorpid"
       />
       <el-table-column
-        label="业务编号,格式RK+YYYY+YY+NNN,编号不能断号,要连续、如果删除该编号,下次新建单据,优先使用删除单据号,每月从001开始。RK CK DB HZ "
+        label="业务编号"
         align="center"
         prop="fBillno"
       />
@@ -233,100 +228,17 @@
         prop="fCustomsdeclartion"
       />
       <el-table-column
-        label="原始业务编号,入库时和f_billno 相同,出库 取入库的f_originalbillno"
+        label="原始业务编号"
         align="center"
         prop="fOriginalbillno"
       />
-      <el-table-column label="制单部门" align="center" prop="fDeptid" />
-      <el-table-column label="业务所属部门" align="center" prop="fBsdeptid" />
-      <el-table-column label="联系人" align="center" prop="fContacts" />
-      <el-table-column label="电话" align="center" prop="fTel" />
-      <el-table-column
-        label="客户名称,t_corps 中的no或 name,模糊查找选择后,存储id,显示name"
-        align="center"
-        prop="fCorpid"
-      />
-      <el-table-column
-        label="货转客户名称,t_corps 中的no或 name,模糊查找选择后,存储id,显示name,自有在货权转移是该字段有效"
-        align="center"
-        prop="fTocorpid"
-      />
-      <el-table-column
-        label="结算方式,默认提取corps中stltypeid	也可以从表t_stltypes中下拉选择,存储id,显示name"
-        align="center"
-        prop="fStltypeid"
-      />
-      <el-table-column
-        label="客户存货编号,格式编号客户编号+YYYY +NNNN,
-编号不能断号,要连续、如果删除该编号,下次新建单据,优先使用,每年从001开始"
-        align="center"
-        prop="fBscorpno"
-      />
-      <el-table-column label="仓库" align="center" prop="fWarehouseid" />
-      <el-table-column label="仓管人" align="center" prop="fStorekeeper" />
-      <el-table-column
-        label="计划件数,由明细表自动合计生成"
-        align="center"
-        prop="fPlanqty"
-      />
-      <el-table-column
-        label="计划毛重,由明细表自动合计生成"
-        align="center"
-        prop="fPlangrossweight"
-      />
-      <el-table-column
-        label="计划净重,由明细表自动合计生成"
-        align="center"
-        prop="fPlannetweight"
-      />
-      <el-table-column
-        label="计划尺码,由明细表自动合计生成"
-        align="center"
-        prop="fPlanvolumn"
-      />
-      <el-table-column
-        label="尺码,由明细表自动合计生成"
-        align="center"
-        prop="fVolumn"
-      />
-      <el-table-column
-        label="贸易方式(数据字典),对应t_trademodels "
-        align="center"
-        prop="fTrademodeid"
-        :formatter="fTrademodeidFormat"
-      />
-      <el-table-column label="经营单位(客户列表)" align="center" prop="fSbu" />
-      <el-table-column
-        label="计费单位(数据字典),下拉选择毛重或净重"
-        align="center"
-        prop="fFeetunit"
-        :formatter="fFeetunitFormat"
-      />
-      <el-table-column label="提单号" align="center" prop="fMblno" />
-      <el-table-column
-        label="船名航次,CMA/A0001"
-        align="center"
-        prop="fVslvoy"
-      />
-      <el-table-column label="到港日期" align="center" prop="fEta" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.fEta, "{y}-{m}-{d}") }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="报关单号" align="center" prop="fCustomno" />
-      <el-table-column
-        label="是否过磅(数据字典)默认 F ,过磅T 否者F 下拉选择"
-        align="center"
-        prop="fIfweigh"
-        :formatter="fIfweighFormat"
-      />
       <el-table-column
-        label="单据类型(数据字典)SJRK"
+        label="单据状态"
         align="center"
-        prop="fBilltype"
-        :formatter="fBilltypeFormat"
+        prop="fBillstatus"
+        :formatter="fBillstatusFormat"
       />
-      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="备注" align="center" prop="remark"/>
       <el-table-column
         label="操作"
         align="center"
@@ -339,7 +251,8 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['warehouseBusiness:warehousebills:edit']"
-            >修改</el-button
+          >修改
+          </el-button
           >
           <el-button
             size="mini"
@@ -347,7 +260,8 @@
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['warehouseBusiness:warehousebills:remove']"
-            >删除</el-button
+          >删除
+          </el-button
           >
         </template>
       </el-table-column>
@@ -364,178 +278,232 @@
     <!-- 添加或修改仓库主(出入库)对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item
-          label="业务编号,格式RK+YYYY+YY+NNN,编号不能断号,要连续、如果删除该编号,下次新建单据,优先使用删除单据号,每月从001开始。
-RK CK DB HZ 
-"
-          prop="fBillno"
-        >
-          <el-input
-            v-model="form.fBillno"
-            placeholder="请输入业务编号,格式RK+YYYY+YY+NNN,编号不能断号,要连续、如果删除该编号,下次新建单据,优先使用删除单据号,每月从001开始。
-RK CK DB HZ 
-"
-          />
-        </el-form-item>
-        <el-form-item label="报关号" prop="fCustomsdeclartion">
-          <el-input
-            v-model="form.fCustomsdeclartion"
-            placeholder="请输入报关号"
-          />
-        </el-form-item>
-        <el-form-item
-          label="原始业务编号,入库时和f_billno 相同,出库 取入库的f_originalbillno"
-          prop="fOriginalbillno"
-        >
-          <el-input
-            v-model="form.fOriginalbillno"
-            placeholder="请输入原始业务编号,入库时和f_billno 相同,出库 取入库的f_originalbillno"
-          />
-        </el-form-item>
-        <el-form-item label="制单部门" prop="fDeptid">
-          <el-input v-model="form.fDeptid" placeholder="请输入制单部门" />
-        </el-form-item>
-        <el-form-item label="业务所属部门" prop="fBsdeptid">
-          <el-input v-model="form.fBsdeptid" placeholder="请输入业务所属部门" />
-        </el-form-item>
-        <el-form-item label="联系人" prop="fContacts">
-          <el-input v-model="form.fContacts" placeholder="请输入联系人" />
-        </el-form-item>
-        <el-form-item label="电话" prop="fTel">
-          <el-input v-model="form.fTel" placeholder="请输入电话" />
-        </el-form-item>
-        <el-form-item
-          label="客户名称,t_corps 中的no或 name,模糊查找选择后,存储id,显示name"
-          prop="fCorpid"
-        >
-          <el-input
-            v-model="form.fCorpid"
-            placeholder="请输入客户名称,t_corps 中的no或 name,模糊查找选择后,存储id,显示name"
-          />
-        </el-form-item>
-        <el-form-item
-          label="货转客户名称,t_corps 中的no或 name,模糊查找选择后,存储id,显示name,自有在货权转移是该字段有效"
-          prop="fTocorpid"
-        >
-          <el-input
-            v-model="form.fTocorpid"
-            placeholder="请输入货转客户名称,t_corps 中的no或 name,模糊查找选择后,存储id,显示name,自有在货权转移是该字段有效"
-          />
-        </el-form-item>
-        <el-form-item
-          label="结算方式,默认提取corps中stltypeid	也可以从表t_stltypes中下拉选择,存储id,显示name"
-          prop="fStltypeid"
-        >
-          <el-input
-            v-model="form.fStltypeid"
-            placeholder="请输入结算方式,默认提取corps中stltypeid	也可以从表t_stltypes中下拉选择,存储id,显示name"
-          />
-        </el-form-item>
-        <el-form-item
-          label="客户存货编号,格式编号客户编号+YYYY +NNNN,
-编号不能断号,要连续、如果删除该编号,下次新建单据,优先使用,每年从001开始"
-          prop="fBscorpno"
-        >
-          <el-input
-            v-model="form.fBscorpno"
-            placeholder="请输入客户存货编号,格式编号客户编号+YYYY +NNNN,
-编号不能断号,要连续、如果删除该编号,下次新建单据,优先使用,每年从001开始"
-          />
-        </el-form-item>
-        <el-form-item label="仓库" prop="fWarehouseid">
-          <el-input v-model="form.fWarehouseid" placeholder="请输入仓库" />
-        </el-form-item>
-        <el-form-item label="仓管人" prop="fStorekeeper">
-          <el-input v-model="form.fStorekeeper" placeholder="请输入仓管人" />
-        </el-form-item>
-        <el-form-item label="入" prop="fBsdate">
-          <el-date-picker
-            clearable
-            size="small"
-            style="width: 200px"
-            v-model="form.fBsdate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择入"
-          >
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="计划件数,由明细表自动合计生成" prop="fPlanqty">
-          <el-input
-            v-model="form.fPlanqty"
-            placeholder="请输入计划件数,由明细表自动合计生成"
-          />
-        </el-form-item>
-        <el-form-item
-          label="计划毛重,由明细表自动合计生成"
-          prop="fPlangrossweight"
-        >
-          <el-input
-            v-model="form.fPlangrossweight"
-            placeholder="请输入计划毛重,由明细表自动合计生成"
-          />
-        </el-form-item>
-        <el-form-item
-          label="计划净重,由明细表自动合计生成"
-          prop="fPlannetweight"
-        >
-          <el-input
-            v-model="form.fPlannetweight"
-            placeholder="请输入计划净重,由明细表自动合计生成"
-          />
-        </el-form-item>
-        <el-form-item label="计划尺码,由明细表自动合计生成" prop="fPlanvolumn">
-          <el-input
-            v-model="form.fPlanvolumn"
-            placeholder="请输入计划尺码,由明细表自动合计生成"
-          />
-        </el-form-item>
-        <el-form-item label="件数,由明细表自动合计生成" prop="fQty">
-          <el-input
-            v-model="form.fQty"
-            placeholder="请输入件数,由明细表自动合计生成"
-          />
-        </el-form-item>
-        <el-form-item label="毛重,由明细表自动合计生成" prop="fGrossweight">
-          <el-input
-            v-model="form.fGrossweight"
-            placeholder="请输入毛重,由明细表自动合计生成"
-          />
-        </el-form-item>
-        <el-form-item label="净重,由明细表自动合计生成" prop="fNetweight">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item
+              label="业务编号"
+              prop="fBillno"
+            >
+              <el-input
+                v-model="form.fBillno"
+                placeholder="请输入业务编号"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="报关号" prop="fCustomsdeclartion">
+              <el-input
+                v-model="form.fCustomsdeclartion"
+                placeholder="请输入报关号"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item
+              label="原始业务编号"
+              prop="fOriginalbillno"
+            >
+              <el-input
+                v-model="form.fOriginalbillno"
+                placeholder="请输入原始业务编号"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="制单部门" prop="fDeptid">
+              <el-input v-model="form.fDeptid" placeholder="请输入制单部门"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el_row>
+          <el-col :span="12">
+            <el-form-item label="业务所属部门" prop="fBsdeptid">
+              <el-input v-model="form.fBsdeptid" placeholder="请输入业务所属部门"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="联系人" prop="fContacts">
+              <el-input v-model="form.fContacts" placeholder="请输入联系人"/>
+            </el-form-item>
+          </el-col>
+        </el_row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="电话" prop="fTel">
+              <el-input v-model="form.fTel" placeholder="请输入电话"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item
+              label="客户名称"
+              prop="fCorpid"
+            >
+              <el-input
+                v-model="form.fCorpid"
+                placeholder="请输入客户名称"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item
+              label="货转客户名称"
+              prop="fTocorpid"
+            >
+              <el-input
+                v-model="form.fTocorpid"
+                placeholder="请输入货转客户名称"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item
+              label="结算方式"
+              prop="fStltypeid"
+            >
+              <el-input
+                v-model="form.fStltypeid"
+                placeholder="请输入结算方式"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item
+              label="客户存货编号"
+              prop="fBscorpno"
+            >
+              <el-input
+                v-model="form.fBscorpno"
+                placeholder="请输入客户存货编号"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="仓库" prop="fWarehouseid">
+              <el-input v-model="form.fWarehouseid" placeholder="请输入仓库"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="仓管人" prop="fStorekeeper">
+              <el-input v-model="form.fStorekeeper" placeholder="请输入仓管人"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="入" prop="fBsdate">
+              <el-date-picker
+                clearable
+                size="small"
+                style="width: 200px"
+                v-model="form.fBsdate"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="选择入"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="计划件数" prop="fPlanqty">
+              <el-input
+                v-model="form.fPlanqty"
+                placeholder="请输入计划件数"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item
+              label="计划毛重"
+              prop="fPlangrossweight"
+            >
+              <el-input
+                v-model="form.fPlangrossweight"
+                placeholder="请输入计划毛重"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item
+              label="计划净重"
+              prop="fPlannetweight"
+            >
+              <el-input
+                v-model="form.fPlannetweight"
+                placeholder="请输入计划净重"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="计划尺码" prop="fPlanvolumn">
+              <el-input
+                v-model="form.fPlanvolumn"
+                placeholder="请输入计划尺码"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="件数" prop="fQty">
+              <el-input
+                v-model="form.fQty"
+                placeholder="请输入件数"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="毛重" prop="fGrossweight">
+              <el-input
+                v-model="form.fGrossweight"
+                placeholder="请输入毛重"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="净重" prop="fNetweight">
           <el-input
             v-model="form.fNetweight"
-            placeholder="请输入净重,由明细表自动合计生成"
+            placeholder="请输入净重"
           />
         </el-form-item>
-        <el-form-item label="尺码,由明细表自动合计生成" prop="fVolumn">
+        <el-form-item label="尺码" prop="fVolumn">
           <el-input
             v-model="form.fVolumn"
-            placeholder="请输入尺码,由明细表自动合计生成"
+            placeholder="请输入尺码"
           />
         </el-form-item>
         <el-form-item
-          label="贸易方式(数据字典),对应t_trademodels "
+          label="贸易方式 "
           prop="fTrademodeid"
         >
           <el-input
             v-model="form.fTrademodeid"
-            placeholder="请输入贸易方式(数据字典),对应t_trademodels "
+            placeholder="请输入贸易方式"
           />
         </el-form-item>
-        <el-form-item label="经营单位(客户列表)" prop="fSbu">
+        <el-form-item label="经营单位" prop="fSbu">
           <el-input
             v-model="form.fSbu"
-            placeholder="请输入经营单位(客户列表)"
+            placeholder="请输入经营单位"
           />
         </el-form-item>
         <el-form-item
-          label="计费单位(数据字典),下拉选择毛重或净重"
+          label="计费单位"
           prop="fFeetunit"
         >
           <el-select
             v-model="form.fFeetunit"
-            placeholder="请选择计费单位(数据字典),下拉选择毛重或净重"
+            placeholder="请选择计费单位"
           >
             <el-option
               v-for="dict in fFeetunitOptions"
@@ -546,7 +514,7 @@ RK CK DB HZ
           </el-select>
         </el-form-item>
         <el-form-item label="提单号" prop="fMblno">
-          <el-input v-model="form.fMblno" placeholder="请输入提单号" />
+          <el-input v-model="form.fMblno" placeholder="请输入提单号"/>
         </el-form-item>
         <el-form-item label="船名航次,CMA/A0001" prop="fVslvoy">
           <el-input
@@ -567,7 +535,7 @@ RK CK DB HZ
           </el-date-picker>
         </el-form-item>
         <el-form-item label="报关单号" prop="fCustomno">
-          <el-input v-model="form.fCustomno" placeholder="请输入报关单号" />
+          <el-input v-model="form.fCustomno" placeholder="请输入报关单号"/>
         </el-form-item>
         <el-form-item
           label="是否过磅(数据字典)默认 F ,过磅T 否者F 下拉选择"
@@ -575,7 +543,7 @@ RK CK DB HZ
         >
           <el-select
             v-model="form.fIfweigh"
-            placeholder="请选择是否过磅(数据字典)默认 F ,过磅T 否者F 下拉选择"
+            placeholder="请选择是否过磅"
           >
             <el-option
               v-for="dict in fIfweighOptions"
@@ -586,12 +554,12 @@ RK CK DB HZ
           </el-select>
         </el-form-item>
         <el-form-item
-          label="是否质押(数据字典),默认 F ,质押T 否者F 下拉选择"
+          label="是否质押"
           prop="fIfpledge"
         >
           <el-select
             v-model="form.fIfpledge"
-            placeholder="请选择是否质押(数据字典),默认 F ,质押T 否者F 下拉选择"
+            placeholder="请选择是否质押"
           >
             <el-option
               v-for="dict in fIfpledgeOptions"
@@ -601,10 +569,10 @@ RK CK DB HZ
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="是否破损(数据字典),默认F否则T" prop="fIfdamage">
+        <el-form-item label="是否破损" prop="fIfdamage">
           <el-select
             v-model="form.fIfdamage"
-            placeholder="请选择是否破损(数据字典),默认F否则T"
+            placeholder="请选择是否破损"
           >
             <el-option
               v-for="dict in fIfdamageOptions"
@@ -615,18 +583,18 @@ RK CK DB HZ
           </el-select>
         </el-form-item>
         <el-form-item
-          label="银行名称,t_corps 中的no或 name,模糊查找选择后,存储id,显示name"
+          label="银行名称"
           prop="fBankcorpid"
         >
           <el-input
             v-model="form.fBankcorpid"
-            placeholder="请输入银行名称,t_corps 中的no或 name,模糊查找选择后,存储id,显示name"
+            placeholder="请输入银行名称"
           />
         </el-form-item>
-        <el-form-item label="单据类型(数据字典)SJRK" prop="fBilltype">
+        <el-form-item label="单据类型" prop="fBilltype">
           <el-select
             v-model="form.fBilltype"
-            placeholder="请选择单据类型(数据字典)SJRK"
+            placeholder="请选择单据类型"
           >
             <el-option
               v-for="dict in fBilltypeOptions"
@@ -636,10 +604,10 @@ RK CK DB HZ
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="状态(数据字典),N 入" prop="fBillstatus">
+        <el-form-item label="状态" prop="fBillstatus">
           <el-select
             v-model="form.fBillstatus"
-            placeholder="请选择状态(数据字典),N 入"
+            placeholder="请选择状态"
           >
             <el-option
               v-for="dict in fBillstatusOptions"
@@ -649,9 +617,6 @@ RK CK DB HZ
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="删除状态" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入删除状态" />
-        </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input
             v-model="form.remark"
@@ -669,341 +634,341 @@ RK CK DB HZ
 </template>
 
 <script>
-import {
-  listWarehousebills,
-  getWarehousebills,
-  delWarehousebills,
-  addWarehousebills,
-  updateWarehousebills,
-  exportWarehousebills,
-} from "@/api/warehouseBusiness/warehousebills";
+  import {
+    listWarehousebills,
+    getWarehousebills,
+    delWarehousebills,
+    addWarehousebills,
+    updateWarehousebills,
+    exportWarehousebills,
+  } from "@/api/warehouseBusiness/warehousebills";
 
-export default {
-  name: "Warehousebills",
-  components: {},
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 仓库主(出入库)表格数据
-      warehousebillsList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 贸易方式(数据字典),对应t_trademodels 字典
-      fTrademodeidOptions: [],
-      // 计费单位(数据字典),下拉选择毛重或净重字典
-      fFeetunitOptions: [],
-      // 是否过磅(数据字典)默认 F ,过磅T 否者F 下拉选择字典
-      fIfweighOptions: [],
-      // 是否质押(数据字典),默认 F ,质押T 否者F 下拉选择字典
-      fIfpledgeOptions: [],
-      // 是否破损(数据字典),默认F否则T字典
-      fIfdamageOptions: [],
-      // 单据类型(数据字典)SJRK字典
-      fBilltypeOptions: [],
-      // 状态(数据字典),N 入字典
-      fBillstatusOptions: [],
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        fBillno: null,
-        fCustomsdeclartion: null,
-        fOriginalbillno: null,
-        fDeptid: null,
-        fBsdeptid: null,
-        fContacts: null,
-        fTel: null,
-        fCorpid: null,
-        fTocorpid: null,
-        fStltypeid: null,
-        fBscorpno: null,
-        fWarehouseid: null,
-        fStorekeeper: null,
-        fBsdate: null,
-        fPlanqty: null,
-        fPlangrossweight: null,
-        fPlannetweight: null,
-        fPlanvolumn: null,
-        fQty: null,
-        fGrossweight: null,
-        fNetweight: null,
-        fVolumn: null,
-        fTrademodeid: null,
-        fSbu: null,
-        fFeetunit: null,
-        fMblno: null,
-        fVslvoy: null,
-        fEta: null,
-        fCustomno: null,
-        fIfweigh: null,
-        fIfpledge: null,
-        fIfdamage: null,
-        fBankcorpid: null,
-        fBilltype: null,
-        fBillstatus: null,
-        fCreateby:null,
-        fCreatetime:null,
-        fGoodsid:null,
-        fCntrtype:null,
-        fCntqty:null
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        fDeptid: [
-          { required: true, message: "制单部门不能为空", trigger: "blur" },
-        ],
-        fBsdeptid: [
-          { required: true, message: "业务所属部门不能为空", trigger: "blur" },
-        ],
-        fCorpid: [
-          {
-            required: true,
-            message:
-              "客户名称,t_corps 中的no或 name,模糊查找选择后,存储id,显示name不能为空",
-            trigger: "blur",
-          },
-        ],
-        fTocorpid: [
-          {
-            required: true,
-            message:
-              "货转客户名称,t_corps 中的no或 name,模糊查找选择后,存储id,显示name,自有在货权转移是该字段有效不能为空",
-            trigger: "blur",
-          },
-        ],
-        fBscorpno: [
-          {
-            required: true,
-            message:
-              "客户存货编号,格式编号客户编号+YYYY +NNNN,编号不能断号,要连续、如果删除该编号,下次新建单据,优先使用,每年从001开始不能为空",
-            trigger: "blur",
-          },
-        ],
-      },
-    };
-  },
-  created() {
-    this.getList();
-    this.getDicts("data_trademodes").then((response) => {
-      this.fTrademodeidOptions = response.data;
-    });
-    this.getDicts("data_unitfees").then((response) => {
-      this.fFeetunitOptions = response.data;
-    });
-    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;
-    });
-    this.getDicts("data_billtype_type").then((response) => {
-      this.fBilltypeOptions = response.data;
-    });
-    this.getDicts("sys_common_status").then((response) => {
-      this.fBillstatusOptions = response.data;
-    });
-  },
-  methods: {
-    /** 查询仓库主(出入库)列表 */
-    getList() {
-      this.loading = true;
-      listWarehousebills(this.queryParams).then((response) => {
-        this.warehousebillsList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 贸易方式(数据字典),对应t_trademodels 字典翻译
-    fTrademodeidFormat(row, column) {
-      return this.selectDictLabel(this.fTrademodeidOptions, row.fTrademodeid);
-    },
-    // 计费单位(数据字典),下拉选择毛重或净重字典翻译
-    fFeetunitFormat(row, column) {
-      return this.selectDictLabel(this.fFeetunitOptions, row.fFeetunit);
-    },
-    // 是否过磅(数据字典)默认 F ,过磅T 否者F 下拉选择字典翻译
-    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);
-    },
-    // 单据类型(数据字典)SJRK字典翻译
-    fBilltypeFormat(row, column) {
-      return this.selectDictLabel(this.fBilltypeOptions, row.fBilltype);
-    },
-    // 状态(数据字典),N 入字典翻译
-    fBillstatusFormat(row, column) {
-      return this.selectDictLabel(this.fBillstatusOptions, row.fBillstatus);
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        fId: null,
-        fBillno: null,
-        fCustomsdeclartion: null,
-        fOriginalbillno: null,
-        fDeptid: null,
-        fBsdeptid: null,
-        fContacts: null,
-        fTel: null,
-        fCorpid: null,
-        fTocorpid: null,
-        fStltypeid: null,
-        fBscorpno: null,
-        fWarehouseid: null,
-        fStorekeeper: null,
-        fBsdate: null,
-        fPlanqty: null,
-        fPlangrossweight: null,
-        fPlannetweight: null,
-        fPlanvolumn: null,
-        fQty: null,
-        fGrossweight: null,
-        fNetweight: null,
-        fVolumn: null,
-        fTrademodeid: null,
-        fSbu: null,
-        fFeetunit: null,
-        fMblno: null,
-        fVslvoy: null,
-        fEta: null,
-        fCustomno: null,
-        fIfweigh: null,
-        fIfpledge: null,
-        fIfdamage: null,
-        fBankcorpid: null,
-        fBilltype: null,
-        fBillstatus: null,
-        delFlag: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: null,
-        remark: null,
-        fCreateby:null,
-        fCreatetime:null,
-        fGoodsid:null,
-        fCntrtype:null,
-        fCntqty
+  export default {
+    name: "Warehousebills",
+    components: {},
+    data() {
+      return {
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        // 仓库主(出入库)表格数据
+        warehousebillsList: [],
+        // 弹出层标题
+        title: "",
+        // 是否显示弹出层
+        open: false,
+        // 贸易方式(数据字典),对应t_trademodels 字典
+        fTrademodeidOptions: [],
+        // 计费单位(数据字典),下拉选择毛重或净重字典
+        fFeetunitOptions: [],
+        // 是否过磅(数据字典)默认 F ,过磅T 否者F 下拉选择字典
+        fIfweighOptions: [],
+        // 是否质押(数据字典),默认 F ,质押T 否者F 下拉选择字典
+        fIfpledgeOptions: [],
+        // 是否破损(数据字典),默认F否则T字典
+        fIfdamageOptions: [],
+        // 单据类型(数据字典)SJRK字典
+        fBilltypeOptions: [],
+        // 状态(数据字典),N 入字典
+        fBillstatusOptions: [],
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          fBillno: null,
+          fCustomsdeclartion: null,
+          fOriginalbillno: null,
+          fDeptid: null,
+          fBsdeptid: null,
+          fContacts: null,
+          fTel: null,
+          fCorpid: null,
+          fTocorpid: null,
+          fStltypeid: null,
+          fBscorpno: null,
+          fWarehouseid: null,
+          fStorekeeper: null,
+          fBsdate: null,
+          fPlanqty: null,
+          fPlangrossweight: null,
+          fPlannetweight: null,
+          fPlanvolumn: null,
+          fQty: null,
+          fGrossweight: null,
+          fNetweight: null,
+          fVolumn: null,
+          fTrademodeid: null,
+          fSbu: null,
+          fFeetunit: null,
+          fMblno: null,
+          fVslvoy: null,
+          fEta: null,
+          fCustomno: null,
+          fIfweigh: null,
+          fIfpledge: null,
+          fIfdamage: null,
+          fBankcorpid: null,
+          fBilltype: null,
+          fBillstatus: null,
+          fCreateby: null,
+          fCreatetime: null,
+          fGoodsid: null,
+          fCntrtype: null,
+          fCntqty: null
+        },
+        // 表单参数
+        form: {},
+        // 表单校验
+        rules: {
+          fDeptid: [
+            {required: true, message: "制单部门不能为空", trigger: "blur"},
+          ],
+          fBsdeptid: [
+            {required: true, message: "业务所属部门不能为空", trigger: "blur"},
+          ],
+          fCorpid: [
+            {
+              required: true,
+              message:
+                "客户名称,t_corps 中的no或 name,模糊查找选择后,存储id,显示name不能为空",
+              trigger: "blur",
+            },
+          ],
+          fTocorpid: [
+            {
+              required: true,
+              message:
+                "货转客户名称,t_corps 中的no或 name,模糊查找选择后,存储id,显示name,自有在货权转移是该字段有效不能为空",
+              trigger: "blur",
+            },
+          ],
+          fBscorpno: [
+            {
+              required: true,
+              message:
+                "客户存货编号,格式编号客户编号+YYYY +NNNN,编号不能断号,要连续、如果删除该编号,下次新建单据,优先使用,每年从001开始不能为空",
+              trigger: "blur",
+            },
+          ],
+        },
       };
-      this.resetForm("form");
     },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
+    created() {
       this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.fId);
-      this.single = selection.length !== 1;
-      this.multiple = !selection.length;
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加仓库主(出入库)";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const fId = row.fId || this.ids;
-      getWarehousebills(fId).then((response) => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改仓库主(出入库)";
+      this.getDicts("data_trademodes").then((response) => {
+        this.fTrademodeidOptions = response.data;
       });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate((valid) => {
-        if (valid) {
-          if (this.form.fId != null) {
-            updateWarehousebills(this.form).then((response) => {
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addWarehousebills(this.form).then((response) => {
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
+      this.getDicts("data_unitfees").then((response) => {
+        this.fFeetunitOptions = response.data;
+      });
+      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;
+      });
+      this.getDicts("data_billtype_type").then((response) => {
+        this.fBilltypeOptions = response.data;
+      });
+      this.getDicts("sys_common_status").then((response) => {
+        this.fBillstatusOptions = response.data;
       });
     },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const fIds = row.fId || this.ids;
-      this.$confirm(
-        '是否确认删除仓库主(出入库)编号为"' + fIds + '"的数据项?',
-        "警告",
-        {
+    methods: {
+      /** 查询仓库主(出入库)列表 */
+      getList() {
+        this.loading = true;
+        listWarehousebills(this.queryParams).then((response) => {
+          this.warehousebillsList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        });
+      },
+      // 贸易方式(数据字典),对应t_trademodels 字典翻译
+      fTrademodeidFormat(row, column) {
+        return this.selectDictLabel(this.fTrademodeidOptions, row.fTrademodeid);
+      },
+      // 计费单位(数据字典),下拉选择毛重或净重字典翻译
+      fFeetunitFormat(row, column) {
+        return this.selectDictLabel(this.fFeetunitOptions, row.fFeetunit);
+      },
+      // 是否过磅(数据字典)默认 F ,过磅T 否者F 下拉选择字典翻译
+      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);
+      },
+      // 单据类型(数据字典)SJRK字典翻译
+      fBilltypeFormat(row, column) {
+        return this.selectDictLabel(this.fBilltypeOptions, row.fBilltype);
+      },
+      // 状态(数据字典),N 入字典翻译
+      fBillstatusFormat(row, column) {
+        return this.selectDictLabel(this.fBillstatusOptions, row.fBillstatus);
+      },
+      // 取消按钮
+      cancel() {
+        this.open = false;
+        this.reset();
+      },
+      // 表单重置
+      reset() {
+        this.form = {
+          fId: null,
+          fBillno: null,
+          fCustomsdeclartion: null,
+          fOriginalbillno: null,
+          fDeptid: null,
+          fBsdeptid: null,
+          fContacts: null,
+          fTel: null,
+          fCorpid: null,
+          fTocorpid: null,
+          fStltypeid: null,
+          fBscorpno: null,
+          fWarehouseid: null,
+          fStorekeeper: null,
+          fBsdate: null,
+          fPlanqty: null,
+          fPlangrossweight: null,
+          fPlannetweight: null,
+          fPlanvolumn: null,
+          fQty: null,
+          fGrossweight: null,
+          fNetweight: null,
+          fVolumn: null,
+          fTrademodeid: null,
+          fSbu: null,
+          fFeetunit: null,
+          fMblno: null,
+          fVslvoy: null,
+          fEta: null,
+          fCustomno: null,
+          fIfweigh: null,
+          fIfpledge: null,
+          fIfdamage: null,
+          fBankcorpid: null,
+          fBilltype: null,
+          fBillstatus: null,
+          delFlag: null,
+          createBy: null,
+          createTime: null,
+          updateBy: null,
+          updateTime: null,
+          remark: null,
+          fCreateby: null,
+          fCreatetime: null,
+          fGoodsid: null,
+          fCntrtype: null,
+          fCntqty: null
+        };
+        this.resetForm("form");
+      },
+      /** 搜索按钮操作 */
+      handleQuery() {
+        this.queryParams.pageNum = 1;
+        this.getList();
+      },
+      /** 重置按钮操作 */
+      resetQuery() {
+        this.resetForm("queryForm");
+        this.handleQuery();
+      },
+      // 多选框选中数据
+      handleSelectionChange(selection) {
+        this.ids = selection.map((item) => item.fId);
+        this.single = selection.length !== 1;
+        this.multiple = !selection.length;
+      },
+      /** 新增按钮操作 */
+      handleAdd() {
+        this.reset();
+        this.open = true;
+        this.title = "添加仓库主(出入库)";
+      },
+      /** 修改按钮操作 */
+      handleUpdate(row) {
+        this.reset();
+        const fId = row.fId || this.ids;
+        getWarehousebills(fId).then((response) => {
+          this.form = response.data;
+          this.open = true;
+          this.title = "修改仓库主(出入库)";
+        });
+      },
+      /** 提交按钮 */
+      submitForm() {
+        this.$refs["form"].validate((valid) => {
+          if (valid) {
+            if (this.form.fId != null) {
+              updateWarehousebills(this.form).then((response) => {
+                this.msgSuccess("修改成功");
+                this.open = false;
+                this.getList();
+              });
+            } else {
+              addWarehousebills(this.form).then((response) => {
+                this.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              });
+            }
+          }
+        });
+      },
+      /** 删除按钮操作 */
+      handleDelete(row) {
+        const fIds = row.fId || this.ids;
+        this.$confirm(
+          '是否确认删除仓库主(出入库)编号为"' + fIds + '"的数据项?',
+          "警告",
+          {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          }
+        )
+          .then(function () {
+            return delWarehousebills(fIds);
+          })
+          .then(() => {
+            this.getList();
+            this.msgSuccess("删除成功");
+          });
+      },
+      /** 导出按钮操作 */
+      handleExport() {
+        const queryParams = this.queryParams;
+        this.$confirm("是否确认导出所有仓库主(出入库)数据项?", "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning",
-        }
-      )
-        .then(function () {
-          return delWarehousebills(fIds);
         })
-        .then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        });
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm("是否确认导出所有仓库主(出入库)数据项?", "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(function () {
-          return exportWarehousebills(queryParams);
-        })
-        .then((response) => {
-          this.download(response.msg);
-        });
+          .then(function () {
+            return exportWarehousebills(queryParams);
+          })
+          .then((response) => {
+            this.download(response.msg);
+          });
+      },
     },
-  },
-};
+  };
 </script>