出入库页面优化和首页优化

src/views/index.vue

@@ -14,7 +14,7 @@
         <el-table-column prop="name" label="新闻公告" />
       </el-table>
     </div>
-    <div style="display: flex;margin-top: 100px">
+    <div style="display: flex;margin-top: -30px">
       <div id="box" style="width:30%;height:350px;"></div>
       <div id="bug" style="width:35%;height:350px;"></div>
       <div id="temp" style="width:30%;height:350px;"></div>
@@ -53,18 +53,6 @@
           date: '2020-11-20 12:00',
           name: '仓储费审核结算审核',
           address: '查看详情'
-        }, {
-          date: '2020-11-20 12:00',
-          name: '某客户账单审核',
-          address: '查看详情'
-        }, {
-          date: '2020-11-20 12:00',
-          name: '某客户账单审核',
-          address: '查看详情'
-        }, {
-          date: '2020-11-20 12:00',
-          name: '某客户账单审核',
-          address: '查看详情'
         }]
       };
     },

src/views/warehouseBusiness/inStock/index.vue

@@ -1342,7 +1342,7 @@
         style="box-shadow: 0 1px 3px rgba(0, 0, 0, 0) !important"
         :visible.sync="editDialogVisible_s"
         width="70%"
-        
+
       >
         <table
           id="print_area"

src/views/warehouseBusiness/outStock/index.vue

@@ -5,110 +5,86 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
+      label-width="88px"
     >
-      <el-form-item label="业务编号" prop="fBillno">
+      <el-form-item label="业务编号" prop="fbillno">
         <el-input
-          v-model="queryParams.fBillno"
+          v-model="queryParams.fbillno"
           placeholder="请输入业务编号"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="制单人" prop="fCreateby">
+      <el-form-item label="制单人" prop="createBy">
         <el-input
-          v-model="queryParams.fCreateby"
+          v-model="queryParams.createBy"
           placeholder="请输入制单人"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="制单日期" prop="fCreatetime">
+      <el-form-item label="出库日期" prop="createTime">
         <el-date-picker
           clearable
           size="small"
-          style="width: 200px"
-          v-model="queryParams.fCreatetime"
+          v-model="queryParams.createTime"
           type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择制单日期"
+          value-format="timestamp"
+          placeholder="选择出库日期"
         >
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="贸易方式" prop="fTrademodeid">
+      <el-form-item label="贸易方式" prop="ftrademodeid">
         <el-input
-          v-model="queryParams.fTrademodeid"
+          v-model="queryParams.ftrademodeid"
           placeholder="请输入贸易方式"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="客户名称" prop="fCorpid">
+      <el-form-item label="货权方" prop="fCorpid">
         <el-input
           v-model="queryParams.fCorpid"
-          placeholder="请输入客户名称"
+          placeholder="请输入货权方"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="经营单位" prop="fSbu">
+      <el-form-item label="提单号" prop="fmblno">
         <el-input
-          v-model="queryParams.fSbu"
-          placeholder="请输入经营单位"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="提单号" prop="fMblno">
-        <el-input
-          v-model="queryParams.fMblno"
+          v-model="queryParams.fmblno"
           placeholder="请输入提单号"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="报关单号" prop="fCustomsdeclartion">
+      <el-form-item label="经营单位" prop="fsbu">
         <el-input
-          v-model="queryParams.fCustomsdeclartion"
-          placeholder="请输入报关单号"
+          v-model="queryParams.fsbu"
+          placeholder="请输入经营单位"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="货物名称" prop="fGoodsid">
-        <el-select v-model="queryParams.fGoodsid" placeholder="请选择货物名称" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="箱型" prop="fCntrtype">
+      <el-form-item label="货物名称" prop="fgoodsid">
         <el-select
-          v-model="queryParams.fCntrtype"
-          placeholder="请选择箱型"
+          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="fCntqty">
-        <el-input
-          v-model="queryParams.fCntqty"
-          placeholder="请输入箱量"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="仓库" prop="fWarehouseid">
+      <el-form-item label="仓库" prop="fwarehouseid">
         <el-input
-          v-model="queryParams.fWarehouseid"
+          v-model="queryParams.fwarehouseid"
           placeholder="请输入仓库"
           clearable
           size="small"
@@ -121,10 +97,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 +115,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['warehouseBusiness:warehousebills:add']"
-          >新增</el-button
+        >新增
+        </el-button
         >
       </el-col>
       <el-col :span="1.5">
@@ -148,7 +127,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['warehouseBusiness:warehousebills:edit']"
-          >修改</el-button
+        >修改
+        </el-button
         >
       </el-col>
       <el-col :span="1.5">
@@ -159,7 +139,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['warehouseBusiness:warehousebills:remove']"
-          >删除</el-button
+        >删除
+        </el-button
         >
       </el-col>
       <el-col :span="1.5">
@@ -169,7 +150,8 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['warehouseBusiness:warehousebills:export']"
-          >导出</el-button
+        >导出
+        </el-button
         >
       </el-col>
       <right-toolbar
@@ -183,162 +165,54 @@
       :data="warehousebillsList"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="状态(数据字典),N 入" 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="业务编号,格式RK+YYYY+YY+NNN,编号不能断号，要连续、如果删除该编号，下次新建单据，优先使用删除单据号，每月从001开始。
-RK CK DB HZ
-"
-        align="center"
-        prop="fBillno"
-      />
-      <el-table-column
-        label="报关号"
-        align="center"
-        prop="fCustomsdeclartion"
-      />
-      <el-table-column
-        label="原始业务编号,入库时和f_billno 相同，出库 取入库的f_originalbillno"
-        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"
+        label="货权方"
         align="center"
         prop="fCorpid"
       />
+      <el-table-column label="提单号" align="center" prop="fMblno"/>
+      <el-table-column label="经营单位" align="center" prop="fSbu"/>
       <el-table-column
-        label="货转客户名称，t_corps 中的no或 name，模糊查找选择后，存储id，显示name，自有在货权转移是该字段有效"
-        align="center"
-        prop="fTocorpid"
-      />
-      <el-table-column
-        label="结算方式，默认提取corps中stltypeid	也可以从表t_stltypes中下拉选择，存储id，显示name"
+        label="出库日期"
         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="fBsdate" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.fBsdate, "{y}-{m}-{d}") }}</span>
-        </template>
+        prop="fcreatetime"
+        width="180"
+      ><template slot-scope="scope">
+        <span>{{ parseTime(scope.row.fcreatetime, "{y}-{m}-{d}") }}</span>
+      </template>
       </el-table-column>
       <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="fQty"
-      />
-      <el-table-column
-        label="毛重，由明细表自动合计生成"
-        align="center"
-        prop="fGrossweight"
-      />
-      <el-table-column
-        label="净重，由明细表自动合计生成"
-        align="center"
-        prop="fNetweight"
-      />
-      <el-table-column
-        label="尺码，由明细表自动合计生成"
-        align="center"
-        prop="fVolumn"
-      />
-      <el-table-column
-        label="贸易方式(数据字典),对应t_trademodels "
+        label="贸易方式"
         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="是否质押(数据字典),默认 F ,质押T 否者F 下拉选择"
-        align="center"
-        prop="fIfpledge"
-        :formatter="fIfpledgeFormat"
-      />
-      <el-table-column
-        label="是否破损(数据字典),默认F否则T"
-        align="center"
-        prop="fIfdamage"
-        :formatter="fIfdamageFormat"
-      />
-      <el-table-column
-        label="银行名称,t_corps 中的no或 name，模糊查找选择后，存储id，显示name"
-        align="center"
-        prop="fBankcorpid"
-      />
-      <el-table-column
-        label="单据类型(数据字典)SJRK"
-        align="center"
-        prop="fBilltype"
-        :formatter="fBilltypeFormat"
-      />
+      <el-table-column label="仓库" align="center" prop="fWarehouseid"/>
+
+
+      <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="状态(数据字典),N 入"
+        label="净重"
         align="center"
-        prop="fBillstatus"
-        :formatter="fBillstatusFormat"
+        prop="fNetweight"
       />
-      <el-table-column label="备注" align="center" prop="remark" />
+
+
+
+
+
+
       <el-table-column
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
+        width="100"
       >
         <template slot-scope="scope">
           <el-button
@@ -347,7 +221,8 @@ RK CK DB HZ
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['warehouseBusiness:warehousebills:edit']"
-            >修改</el-button
+          >修改
+          </el-button
           >
           <el-button
             size="mini"
@@ -355,12 +230,12 @@ RK CK DB HZ
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['warehouseBusiness:warehousebills:remove']"
-            >删除</el-button
+          >删除
+          </el-button
           >
         </template>
       </el-table-column>
     </el-table>
-
     <pagination
       v-show="total > 0"
       :total="total"
@@ -368,7 +243,6 @@ RK CK DB HZ
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-
     <!-- 添加或修改仓库主(出入库)对话框 -->
     <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="80%" append-to-body>
       <el-form
@@ -381,7 +255,7 @@ RK CK DB HZ
         <el-row>
           <el-col :span="8">
             <el-form-item label="制单人" prop="createBy">
-              <el-input disabled v-model="form.createBy" placeholder="制单人"/>
+              <el-input disabled v-model="form.createBy" style="width: 250px" placeholder="制单人"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -390,6 +264,7 @@ RK CK DB HZ
                 v-model="form.fDeptid"
                 filterable
                 disabled
+                style="width: 250px"
                 remote>
                 <el-option
                   v-for="dict in deptOptions"
@@ -404,7 +279,7 @@ RK CK DB HZ
             <el-form-item disabled label="制单日期" prop="fbilldate">
               <el-date-picker
                 v-model="form.createTime"
-                style="width: 375px"
+                size="large"
                 type="date"
                 disabled
                 value-format="timestamp"
@@ -421,6 +296,7 @@ RK CK DB HZ
                 v-model="form.fCorpid"
                 filterable
                 remote
+                style="width: 250px"
                 :remote-method="corpsRemoteMethod"
                 placeholder="请选择货权方">
                 <el-option
@@ -434,12 +310,12 @@ RK CK DB HZ
           </el-col>
           <el-col :span="8">
             <el-form-item label="联系人" prop="fContacts">
-              <el-input v-model="form.fContacts" placeholder="请输入电话"/>
-              <!--<el-select
+              <el-select
                 v-model="form.fContacts"
                 filterable
                 remote
                 :remote-method="userRemoteMethod"
+                style="width: 250px"
                 placeholder="请选择联系人">
                 <el-option
                   v-for="dict in userOptions"
@@ -447,31 +323,31 @@ RK CK DB HZ
                   :label="dict.nickName"
                   :value="dict.userName"
                 ></el-option>
-              </el-select>-->
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="电话" prop="ftel">
-              <el-input v-model="form.fTel" placeholder="请输入电话"/>
+              <el-input v-model="form.fTel" style="width: 250px" placeholder="请输入电话"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
             <el-form-item label="提单号" prop="fmblno">
-              <el-input v-model="form.fMblno" placeholder="请输入提单号"/>
+              <el-input v-model="form.fMblno" style="width: 250px" placeholder="请输入提单号"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="船名航次" prop="fvslvoy">
-              <el-input v-model="form.fVslvoy" placeholder="船名航次"/>
+              <el-input v-model="form.fVslvoy" style="width: 250px" placeholder="船名航次"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="到港日期" prop="feta">
               <el-date-picker
                 v-model="form.fEta"
-                style="width: 375px"
+                style="width: 250px"
                 type="date"
                 value-format="timestamp"
                 placeholder="到港日期"
@@ -484,12 +360,12 @@ RK CK DB HZ
         <el-row>
           <el-col :span="8">
             <el-form-item label="报关单号" prop="fcustomno">
-              <el-input v-model="form.fCustomno" laceholder="报关单号"/>
+              <el-input v-model="form.fCustomno" style="width: 250px" laceholder="报关单号"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="贸易方式" prop="ftrademodeid">
-              <el-select v-model="form.fTrademodeid" placeholder="请选择贸易方式" clearable size="small">
+              <el-select v-model="form.fTrademodeid" placeholder="请选择贸易方式" clearable style="width: 250px">
                 <el-option
                   v-for="dict in fTrademodeidOptions"
                   :key="dict.dictValue"
@@ -505,7 +381,7 @@ RK CK DB HZ
                 v-model="form.fStltypeid"
                 placeholder="请选择结算方式"
                 clearable
-                size="small"
+                style="width: 250px;"
               >
                 <el-option
                   v-for="dict in fStltypeOptions"
@@ -524,6 +400,7 @@ RK CK DB HZ
                 v-model="form.fWarehouseid"
                 filterable
                 remote
+                style="width: 250px"
                 :remote-method="warehouseRemoteMethod"
                 placeholder="请选择仓库">
                 <el-option
@@ -537,16 +414,16 @@ RK CK DB HZ
           </el-col>
           <el-col :span="8">
             <el-form-item label="仓管员" prop="fstorekeeper">
-              <el-input v-model="form.fStorekeeper" placeholder="请输入仓管员"/>
+              <el-input v-model="form.fStorekeeper" placeholder="请输入仓管员" style="width: 250px"/>
             </el-form-item>
           </el-col><el-col :span="8">
-          <el-form-item label="入库日期" prop="fbsdate">
+          <el-form-item label="出库日期" prop="fbsdate">
             <el-date-picker
               v-model="form.fBsdate"
-              style="width: 375px"
+              style="width: 250px"
               type="date"
               value-format="timestamp"
-              placeholder="入库日期"
+              placeholder="出库日期"
             >
             </el-date-picker>
           </el-form-item>
@@ -559,7 +436,7 @@ RK CK DB HZ
                 v-model="form.fIfpledge"
                 placeholder="请选择是否过磅"
                 clearable
-                size="small"
+                style="width: 250px"
               >
                 <el-option
                   v-for="dict in fIfpledgeOptions"
@@ -572,7 +449,7 @@ RK CK DB HZ
           </el-col>
           <el-col :span="8">
             <el-form-item label="银行名称" prop="fbankcorpid">
-              <el-input v-model="form.fBankcorpid" laceholder="银行名称"/>
+              <el-input v-model="form.fBankcorpid" laceholder="银行名称" style="width: 250px"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -582,6 +459,7 @@ RK CK DB HZ
                 filterable
                 remote
                 :remote-method="fSbuRemoteMethod"
+                style="width: 250px"
                 placeholder="请选择经营单位">
                 <el-option
                   v-for="dict in fSbuOptions"
@@ -600,7 +478,7 @@ RK CK DB HZ
                 v-model="form.fIfweigh"
                 placeholder="请选择是否过磅"
                 clearable
-                size="small"
+                style="width: 250px"
               >
                 <el-option
                   v-for="dict in fIfweighOptions"
@@ -617,7 +495,7 @@ RK CK DB HZ
                 v-model="form.fIfdamage"
                 placeholder="请选择是否破损"
                 clearable
-                size="small"
+                style="width: 250px"
               >
                 <el-option
                   v-for="dict in fIfdamageOptions"
@@ -630,7 +508,7 @@ RK CK DB HZ
           </el-col>
           <el-col :span="8">
             <el-form-item label="客户存货编号" prop="fbscorpno">
-              <el-input v-model="form.fBscorpno" laceholder="客户存货编号"/>
+              <el-input v-model="form.fBscorpno" style="width: 250px" laceholder="客户存货编号"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -640,7 +518,7 @@ RK CK DB HZ
               <el-select v-model="form.fBillingway "
                          placeholder="请选择计费方式"
                          clearable
-                         size="small"
+                         style="width: 250px"
               >
                 <el-option
                   v-for="dict in fFeetunitOptions"
@@ -657,7 +535,7 @@ RK CK DB HZ
                 v-model="form.fFeetunit"
                 placeholder="请选择计费单位"
                 clearable
-                size="small"
+                style="width: 250px"
               >
                 <el-option
                   v-for="dict in fFeetunitOptions"
@@ -691,7 +569,7 @@ RK CK DB HZ
         <el-table-column label="序号" type="index" width="80">
         </el-table-column>
         <el-table-column
-          prop="fBsdate"
+          prop="fbsdate"
           header-align="center"
           align="center"
           label="入库日期"
@@ -708,7 +586,7 @@ RK CK DB HZ
           </template>
         </el-table-column>
         <el-table-column
-          prop="fGoodsid"
+          prop="fgoodsid"
           header-align="center"
           align="center"
           label="品名"
@@ -730,7 +608,7 @@ RK CK DB HZ
           </template>
         </el-table-column>
         <el-table-column
-          prop="fCntrtype"
+          prop="fcntrtype"
           header-align="center"
           align="center"
           label="箱型"
@@ -760,7 +638,7 @@ RK CK DB HZ
           </template>
         </el-table-column>
         <el-table-column
-          prop="fPlangrossweight"
+          prop="fplangrossweight"
           header-align="center"
           align="center"
           label="计划毛重"
@@ -775,7 +653,7 @@ RK CK DB HZ
           </template>
         </el-table-column>
         <el-table-column
-          prop="fPlannetweight"
+          prop="fplannetweight"
           header-align="center"
           align="center"
           label="计划净重"
@@ -783,14 +661,14 @@ RK CK DB HZ
           <template slot-scope="scope">
             <el-input
               oninput="value=value.replace(/[^\d.]/g,'')"
-              v-model="scope.row.fPlannetweight"
+              v-model="scope.row.fplannetweight"
               placeholder="计划净重"
               show-word-limit
             />
           </template>
         </el-table-column>
         <el-table-column
-          prop="fPlanvolumn"
+          prop="fplanvolumn"
           header-align="center"
           align="center"
           label="计划尺码"
@@ -805,7 +683,7 @@ RK CK DB HZ
           </template>
         </el-table-column>
         <el-table-column
-          prop="fPlanqty"
+          prop="fplanqty"
           header-align="center"
           align="center"
           label="计划件数"
@@ -820,7 +698,7 @@ RK CK DB HZ
           </template>
         </el-table-column>
         <el-table-column
-          prop="fGrossweight"
+          prop="fgrossweight"
           header-align="center"
           align="center"
           label="入库毛重"
@@ -835,7 +713,7 @@ RK CK DB HZ
           </template>
         </el-table-column>
         <el-table-column
-          prop="fNetweight"
+          prop="fnetweight"
           header-align="center"
           align="center"
           label="入库净重"
@@ -850,7 +728,7 @@ RK CK DB HZ
           </template>
         </el-table-column>
         <el-table-column
-          prop="fQty"
+          prop="fqty"
           header-align="center"
           align="center"
           label="入库件数"
@@ -880,7 +758,7 @@ RK CK DB HZ
           </template>
         </el-table-column>
         <el-table-column
-          prop="fWarehouselocid"
+          prop="fwarehouselocid"
           header-align="center"
           align="center"
           label="库区"
@@ -924,7 +802,7 @@ RK CK DB HZ
           </template>
         </el-table-column>
         <el-table-column
-          prop="fTruckno"
+          prop="ftruckno"
           header-align="center"
           align="center"
           label="车号"
@@ -1001,6 +879,14 @@ RK CK DB HZ
           align="center"
           label="上传人"
         >
+          <template slot-scope="scope">
+            <el-input
+              v-model="scope.row.opUserName"
+              :disabled="browseStatus"
+              placeholder="上传人"
+              show-word-limit
+            />
+          </template>
         </el-table-column>
         <el-table-column
           prop="opDate"
@@ -1020,6 +906,7 @@ RK CK DB HZ
           </template>
         </el-table-column>
         <el-table-column
+          prop="attachId"
           header-align="center"
           align="center"
           width="250PX"
@@ -1432,528 +1319,857 @@ RK CK DB HZ
         </el-table-column>
       </el-table>
       <div slot="footer" class="dialog-footer">
+<!--        <el-button-->
+<!--          type="danger"-->
+<!--          size="mini"-->
+<!--          prop="打印"-->
+<!--          @click="showEditDialog_ss"-->
+<!--        >收货单-->
+<!--        </el-button>-->
+<!--        <el-button-->
+<!--          type="danger"-->
+<!--          size="mini"-->
+<!--          prop="打印"-->
+<!--          @click="showEditDialog_s"-->
+<!--        >入库单-->
+<!--        </el-button>-->
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
+      <el-dialog
+        title="入库页面"
+        :modal= false
+        style="box-shadow: 0 1px 3px rgba(0, 0, 0, 0) !important"
+        :visible.sync="editDialogVisible_s"
+        width="70%"
+
+      >
+        <table
+          id="print_area"
+          class="biaoge zzss"
+          border="1"
+          style="border-collapse: collapse; border: none"
+        >
+          <tr>
+            <td
+              width="100"
+              colspan="7"
+              class="zzss"
+              style=" font-size: 28px; font-weight: bold; border: none"
+            >
+              青岛大木进进仓单
+            </td>
+          </tr>
+          <tr>
+            <td
+              width="100"
+              colspan="7"
+              class="zzss"
+              style="font-size: 28px; font-weight: bold; border: none"
+            >
+              &nbsp;
+            </td>
+          </tr>
+          <tr>
+            <td width="450" colspan="2" class="zzss">货权方：某某有限公司</td>
+            <td width="450" colspan="2" class="zzss">仓库：某某3号大仓</td>
+            <td width="450" colspan="3" class="zzss">
+              地址：青岛市市北区郑州路1344号
+            </td>
+          </tr>
+          <tr>
+            <td width="200" colspan="2" class="zzss">保管方：某某有限公司</td>
+            <td width="200" colspan="2" class="zzss">联系人：张三</td>
+            <td width="200" colspan="3" class="zzss">
+              电话：0532-561651561-546
+            </td>
+          </tr>
+          <tr>
+            <td width="100" border="1">提单号</td>
+            <td width="100">品名</td>
+            <td width="100">箱型</td>
+            <td width="100">品牌</td>
+            <td width="100">件数</td>
+            <td width="100">重量</td>
+            <td width="100">包装规格</td>
+          </tr>
+          <tr>
+            <td width="100">56165654555</td>
+            <td width="100">某某商品</td>
+            <td width="100">20GP</td>
+            <td width="100">某某</td>
+            <td width="100">包</td>
+            <td width="100">吨</td>
+            <td width="100">50kg</td>
+          </tr>
+          <tr>
+            <td width="100">序号</td>
+            <td width="100">入库日期</td>
+            <td width="100">箱量(20GP)</td>
+            <td width="100">重量</td>
+            <td width="100">件数</td>
+            <td width="100">出库重量</td>
+            <td width="100">出库件数</td>
+          </tr>
+          <tr>
+            <td width="100">1</td>
+            <td width="100">2020-11-20</td>
+            <td width="100">10</td>
+            <td width="100">100</td>
+            <td width="100">10000</td>
+            <td width="100">20</td>
+            <td width="100">3000</td>
+          </tr>
+          <tr>
+            <td width="100">2</td>
+            <td width="100">2020-11-20</td>
+            <td width="100">10</td>
+            <td width="100">100</td>
+            <td width="100">10000</td>
+            <td width="100">20</td>
+            <td width="100">3000</td>
+          </tr>
+          <tr>
+            <td width="100">3</td>
+            <td width="100">2020-11-20</td>
+            <td width="100">10</td>
+            <td width="100">100</td>
+            <td width="100">10000</td>
+            <td width="100">20</td>
+            <td width="100">3000</td>
+          </tr>
+          <tr>
+            <td width="100">4</td>
+            <td width="100">2020-11-20</td>
+            <td width="100">10</td>
+            <td width="100">100</td>
+            <td width="100">10000</td>
+            <td width="100">20</td>
+            <td width="100">3000</td>
+          </tr>
+          <tr>
+            <td width="100">5</td>
+            <td width="100">2020-11-20</td>
+            <td width="100">10</td>
+            <td width="100">100</td>
+            <td width="100">10000</td>
+            <td width="100">20</td>
+            <td width="100">3000</td>
+          </tr>
+          <tr>
+            <td width="100">6</td>
+            <td width="100">2020-11-20</td>
+            <td width="100">10</td>
+            <td width="100">100</td>
+            <td width="100">10000</td>
+            <td width="100">20</td>
+            <td width="100">3000</td>
+          </tr>
+          <tr>
+            <td width="100">7</td>
+            <td width="100">2020-11-20</td>
+            <td width="100">10</td>
+            <td width="100">100</td>
+            <td width="100">10000</td>
+            <td width="100">20</td>
+            <td width="100">3000</td>
+          </tr>
+          <tr>
+            <td width="100" colspan="2">合计：</td>
+            <td width="100">10</td>
+            <td width="100">100</td>
+            <td width="100">10000</td>
+            <td width="100">20</td>
+            <td width="100">3000</td>
+          </tr>
+          <tr>
+            <td width="100">备注：</td>
+            <td width="100" colspan="6"></td>
+          </tr>
+          <tr>
+            <td width="100" colspan="7" class="zzss">
+              本进仓单经仓管员签字并经保管方盖章后即专项作为货物所有人的货权证明，本单据不得转让。
+            </td>
+          </tr>
+          <tr style="border: none">
+            <td width="100" colspan="2" class="zzss" style="border: none">
+              开单员：
+            </td>
+            <td width="100" colspan="3" class="zzss" style="border: none"></td>
+            <td width="100" colspan="2" class="zzss" style="border: none">
+              仓管员：张三
+            </td>
+          </tr>
+          <tr style="border: none">
+            <td width="100" colspan="2" class="zzss" style="border: none">
+              开单时间：
+            </td>
+            <td width="100" colspan="3" class="zzss" style="border: none"></td>
+            <td width="100" colspan="2" class="zzss" style="border: none">
+              (盖章)
+            </td>
+          </tr>
+        </table>
+        <button @click="printSomething">打印</button>
+      </el-dialog>
+      <el-dialog
+        title="收货单打印"
+        style="box-shadow: 0 1px 3px rgba(0, 0, 0, 0) !important"
+        :visible.sync="editDialogVisible_ss"
+        width="70%"
+        :modal= false
+      >
+        <table
+          id="print_area"
+          class="biaoge zzss"
+          border="1"
+          style="border-collapse: collapse; border: none"
+        >
+          <tr>
+            <td
+              width="1400"
+              colspan="6"
+              class="zzss"
+              style="font-size: 28px; font-weight: bold; border: none"
+            >
+              大木国际物流(青岛)有限公司收货单
+            </td>
+          </tr>
+          <tr>
+            <td
+              width="900"
+              colspan="4"
+              class="zzss"
+              style="font-size: 28px; font-weight: bold"
+            >
+              &nbsp;
+            </td>
+            <td
+              width="500"
+              colspan="2"
+              style="padding-bottom: 0px; font-weight: bold; border: none"
+              class="zzss"
+            >
+              出库日期：2020-11-20
+            </td>
+          </tr>
+          <tr>
+            <td width="200">车号</td>
+            <td width="200">苏HFN751</td>
+            <td width="200">货物品名</td>
+            <td width="200" colspan="4" class="zzss">某某商品名</td>
+          </tr>
+          <tr>
+            <td width="1400" colspan="6">&nbsp;</td>
+          </tr>
+          <tr>
+            <td>备注:</td>
+            <td colspan="5"></td>
+          </tr>
+          <tr>
+            <td>收费</td>
+            <td>装箱费</td>
+            <td>100元</td>
+            <td colspan="4">办单费：5元，过磅费自理</td>
+          </tr>
+          <tr>
+            <td>司机签字：</td>
+            <td></td>
+            <td>电话</td>
+            <td>15896154516</td>
+            <td colspan="2" rowspan="2">
+              确认货物数量无误，包装于货物完好！<br />出库盖好篷布，如有违背责任自负<br />装卸工是否收小费
+            </td>
+          </tr>
+          <tr>
+            <td>制表：</td>
+            <td>张三</td>
+            <td>机械/人工：</td>
+            <td></td>
+          </tr>
+          <tr>
+            <td colspan="6" class="zzss">&nbsp;</td>
+          </tr>
+          <tr>
+            <td width="280" class="zzss"></td>
+            <td width="280" class="zzss"></td>
+            <td width="280" class="zzss"></td>
+            <td width="280" class="zzss"></td>
+            <td width="290" class="zzss">地址：淮河东路96号</td>
+            <td width="290" class="zzss">电话：18685818919</td>
+          </tr>
+        </table>
+        <button @click="printSomething">打印</button>
+      </el-dialog>
     </el-dialog>
   </div>
 </template>
 
 <script>
-import {
-  listWarehousebills,
-  getWarehousebills,
-  delWarehousebills,
-  addWarehousebills,
-  updateWarehousebills,
-  exportWarehousebills,
-} from "@/api/warehouseBusiness/warehouseOutStock";
+  import print from 'print-js'
+  import {
+    listWarehousebills,
+    getWarehousebills,
+    delWarehousebills,
+    addWarehousebills,
+    updateWarehousebills,
+    exportWarehousebills,
+  } from "@/api/warehouseBusiness/warehouseInStock";
 
-import {listCorps} from "@/api/basicdata/corps";
+  import {listCorps} from "@/api/basicdata/corps";
 
-import {listWarehouse} from "@/api/basicdata/warehouse";
+  import {listWarehouse} from "@/api/basicdata/warehouse";
 
-import {listGoods} from "@/api/basicdata/goods";
+  import {listGoods} from "@/api/basicdata/goods";
 
-import {listUser, queryUserVal} from "@/api/system/user";
+  import {listUser, queryUserVal} from "@/api/system/user";
 
-export default {
-  name: "Warehousebills",
-  components: {},
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      userVal: {
-        userName: null,
-        nickName: null,
-        deptId: null
-      },
-      queryForm: {},
-      dataList: [],
-      warehouseCrList: [],
-      warehouseDrList: [],
-      browseStatus: false,
-      relevantAttachments: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 仓库主(出入库)表格数据
-      warehousebillsList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 货权方(客户数据)
-      fMblnoOptions: [],
-      // 货权方(客户数据)
-      fSbuOptions: [],
-      // 操作员
-      userOptions: [],
-      // 操作员
-      goodsOptions: [],
-      // 制单部门
-      deptOptions: [],
-      // 仓库(仓库数据)
-      warehouseOptions: [],
-      // 贸易方式(数据字典),对应t_trademodels 字典
-      fTrademodeidOptions: [],
-      // 计费单位(数据字典),下拉选择毛重或净重字典
-      fFeetunitOptions: [],
-      // 结算方式(数据字典),下拉选择字典
-      fStltypeOptions: [],
-      // 是否过磅(数据字典)默认 F ,过磅T 否者F 下拉选择字典
-      fIfweighOptions: [],
-      // 是否质押(数据字典),默认 F ,质押T 否者F 下拉选择字典
-      fIfpledgeOptions: [],
-      // 是否破损(数据字典),默认F否则T字典
-      fIfdamageOptions: [],
-      // 单据类型(数据字典)SJRK字典
-      fBilltypeOptions: [],
-      // 状态(数据字典),N 入字典
-      fBillstatusOptions: [],
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        fBillno: null,
-        createBy: null,
-        createTime: 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_stltype_type").then((response) => {
-      this.fStltypeOptions = 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: null
+  export default {
+    name: "Warehousebills",
+    components: {},
+    data() {
+      return {
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        ids: [],
+        userVal: {
+          userName: null,
+          nickName: null,
+          deptId: null
+        },
+        queryForm: {},
+        // 添加用户对话框
+        editDialogVisible_s: false,
+        editDialogVisible_ss: false,
+        editDialogClosed_ss: false,
+        dataList: [],
+        warehouseCrList: [],
+        warehouseDrList: [],
+        browseStatus: false,
+        relevantAttachments: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        // 仓库主(出入库)表格数据
+        warehousebillsList: [],
+        // 弹出层标题
+        title: "",
+        // 是否显示弹出层
+        open: false,
+        // 货权方(客户数据)
+        fMblnoOptions: [],
+        // 货权方(客户数据)
+        fSbuOptions: [],
+        // 操作员
+        userOptions: [],
+        // 操作员
+        goodsOptions: [],
+        // 制单部门
+        deptOptions: [],
+        // 仓库(仓库数据)
+        warehouseOptions: [],
+        // 贸易方式(数据字典),对应t_trademodels 字典
+        fTrademodeidOptions: [],
+        // 计费单位(数据字典),下拉选择毛重或净重字典
+        fFeetunitOptions: [],
+        // 结算方式(数据字典),下拉选择字典
+        fStltypeOptions: [],
+        // 是否过磅(数据字典)默认 F ,过磅T 否者F 下拉选择字典
+        fIfweighOptions: [],
+        // 是否质押(数据字典),默认 F ,质押T 否者F 下拉选择字典
+        fIfpledgeOptions: [],
+        // 是否破损(数据字典),默认F否则T字典
+        fIfdamageOptions: [],
+        // 单据类型(数据字典)SJRK字典
+        fBilltypeOptions: [],
+        // 状态(数据字典),N 入字典
+        fBillstatusOptions: [],
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          fBillno: null,
+          createBy: null,
+          createTime: 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;
-    },
-    queryUser() {
-      queryUserVal().then((response) => {
-        if (response.user !== null) {
-          this.userVal = response.user
-          this.$set(this.form, 'fDeptid', this.userVal.deptId)
-          this.$set(this.form, 'createBy', this.userVal.userName)
-          this.$set(this.form, 'createTime', Date.parse(new Date()))
-        }
-        if (response.dept !== null) {
-          this.deptOptions = []
-          this.deptOptions.push(response.dept)
-        }
+      this.getDicts("data_trademodes").then((response) => {
+        this.fTrademodeidOptions = response.data;
       });
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.queryUser()
-      this.open = true;
-      this.title = "入库单";
-    },
-    // 添加list
-    addRelevant() {
-      console.log(JSON.stringify(this.dataList))
-      this.dataList.push({
-        fbsdate: null,
-        fgoodsid: null,
-        fcntrtype: null,
-        fCntqty: null,
-        fplangrossweight: null,
-        fplanvolumn: null,
-        fplanqty: null,
-        fgrossweight: null,
-        fqty: null,
-        fPackagespecs: null,
-        fwarehouselocid: null,
-        fBoxno: null,
-        fGoodsval: null,
-        ftruckno: null,
-        remark: null
+      this.getDicts("data_unitfees").then((response) => {
+        this.fFeetunitOptions = response.data;
+      });
+      this.getDicts("data_stltype_type").then((response) => {
+        this.fStltypeOptions = 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;
       });
     },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const fId = row.fid || this.ids;
-      getWarehousebills(row.fid).then((response) => {
-        this.form = response.data.warehousebills;
-        this.$set(this.form, 'fCorpid', response.data.warehousebills.fcorpid)
-        this.$set(this.form, 'fWarehouseid', response.data.warehousebills.fwarehouseid)
-        this.$set(this.form, 'fContacts', response.data.warehousebills.fcontacts)
-        this.$set(this.form, 'fTel', response.data.warehousebills.ftel)
-        this.$set(this.form, 'fMblno', response.data.warehousebills.fmblno)
-        this.$set(this.form, 'fBsdate', Date.parse(response.data.warehousebills.fbsdate))
-        this.$set(this.form, 'fStorekeeper', response.data.warehousebills.fstorekeeper)
-        this.$set(this.form, 'createBy', response.data.warehousebills.createBy)
-        this.$set(this.form, 'fDeptid', response.data.warehousebills.fdeptid)
-        this.$set(this.form, 'fDilldate', Date.parse(response.data.warehousebills.fbilldate))
-        this.$set(this.form, 'fVslvoy', response.data.warehousebills.fvslvoy)
-        this.$set(this.form, 'fEta', Date.parse(response.data.warehousebills.feta))
-        this.$set(this.form, 'createTime', Date.parse(response.data.warehousebills.createTime))
-        this.$set(this.form, 'fTrademodeid', response.data.warehousebills.ftrademodeid + '')
-        this.$set(this.form, 'fBillingway', response.data.warehousebills.fbillingway + '')
-        this.$set(this.form, 'fFeetunit', response.data.warehousebills.ffeetunit + '')
-        this.$set(this.form, 'fBscorpno', response.data.warehousebills.fbscorpno)
-        this.$set(this.form, 'fCustomno', response.data.warehousebills.fcustomno)
-        this.$set(this.form, 'fStltypeid', response.data.warehousebills.fstltypeid + '')
-        this.$set(this.form, 'fIfweigh', response.data.warehousebills.fifweigh + '')
-        this.$set(this.form, 'fIfdamage', response.data.warehousebills.fifdamage + '')
-        this.$set(this.form, 'fSbu', response.data.warehousebills.fsbu)
-        this.$set(this.form, 'fIfpledge', response.data.warehousebills.fifpledge + '')
-        this.$set(this.form, 'fBankcorpid', response.data.warehousebills.fbankcorpid)
-        this.$set(this.form, 'remark', response.data.warehousebills.remark)
-        this.deptOptions = []
-        this.deptOptions.push(response.data.dept)
-        this.fMblnoOptions = []
-        this.fMblnoOptions.push(response.data.fCorps)
-        if (response.data.fSbu !== null) {
-          this.fSbuOptions = []
-          this.fSbuOptions.push(response.data.fSbu)
-        }
-        if (response.data.warehouse !== null) {
-          this.warehouseOptions = []
-          this.warehouseOptions.push(response.data.warehouse)
-        }
-        if (typeof response.data.warehouseBillsItem !== 'undefined' && response.data.warehouseBillsItem !== null) {
-          this.dataList = response.data.warehouseBillsItem
-          for (let item in this.dataList) {
-            this.$set(this.dataList[item], 'fBsdate', Date.parse(this.dataList[item].fBsdate))
+    methods: {
+      printSomething() {
+        // 此处的style即为打印时的样式
+        const style =
+          "@media print { .print-div{ padding:8px;background-color:#cccccc;line-height:12px } .red{ color:#f00} .green{color:green} td{text-align: center}}";
+        print({
+          printable: "print_area",
+          type: "html",
+          style: style, // 亦可使用引入的外部css;
+          scanStyles: false,
+        });
+      },
+      // 添加list
+      addRelevant() {
+        console.log(JSON.stringify(this.dataList))
+        this.dataList.push({
+          fbsdate: null,
+          fgoodsid: null,
+          fcntrtype: null,
+          fCntqty: null,
+          fplangrossweight: null,
+          fplanvolumn: null,
+          fplanqty: null,
+          fgrossweight: null,
+          fqty: null,
+          fPackagespecs: null,
+          fwarehouselocid: null,
+          fBoxno: null,
+          fGoodsval: null,
+          ftruckno: null,
+          remark: null
+        });
+      },
+      // 收货单打印界面
+      showEditDialog_s() {
+        console.log("@@@@");
+        this.editDialogVisible_s = true;
+      },
+      showEditDialog_ss() {
+        this.editDialogVisible_ss = true;
+      },
+      // 收款信息
+      addCollection() {
+        var obj = {};
+        this.warehouseDrList.push(obj);
+      },
+      addpayment() {
+        var obj = {};
+        this.warehouseCrList.push(obj);
+      },
+      queryUser() {
+        queryUserVal().then((response) => {
+          if (response.user !== null) {
+            this.userVal = response.user
+            this.$set(this.form, 'fDeptid', this.userVal.deptId)
+            this.$set(this.form, 'createBy', this.userVal.userName)
+            this.$set(this.form, 'createTime', Date.parse(new Date()))
           }
-          console.log(JSON.stringify(this.dataList))
-
-          if (response.data.goodsList !== null) {
-            this.goodsOptions = []
-            this.goodsOptions = response.data.goodsList
+          if (response.dept !== null) {
+            this.deptOptions = []
+            this.deptOptions.push(response.dept)
           }
-        }
+        });
+      },
+      /** 查询仓库主(出入库)列表 */
+      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.queryUser()
         this.open = true;
-        this.title = "修改仓库主(出入库)";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate((valid) => {
-        if (valid) {
-          let formData = new window.FormData();
-          // 附件数据
-          formData.append("tWarehouseBills", JSON.stringify(this.form));
-          // 附件数据
-          formData.append("tWhgenleg", null);
-          // 费用明细付款
-          formData.append("tWarehousebillsfeesCr", JSON.stringify(this.warehouseCrList));
-          // 收款
-          formData.append("tWarehousebillsfeesDr", JSON.stringify(this.warehouseDrList));
-          // 库存明细
-          formData.append("tWarehousebillsitems", JSON.stringify(this.dataList));
-          addWarehousebills(formData).then((response) => {
-            this.msgSuccess("新增成功");
-            this.open = false;
+        this.title = "出库单";
+      },
+      /** 修改按钮操作 */
+      handleUpdate(row) {
+        this.reset();
+        const fId = row.fid || this.ids;
+        getWarehousebills(row.fid).then((response) => {
+          this.form = response.data.warehousebills;
+          this.$set(this.form, 'fCorpid', response.data.warehousebills.fcorpid)
+          this.$set(this.form, 'fWarehouseid', response.data.warehousebills.fwarehouseid)
+          this.$set(this.form, 'fContacts', response.data.warehousebills.fcontacts)
+          this.$set(this.form, 'fTel', response.data.warehousebills.ftel)
+          this.$set(this.form, 'fMblno', response.data.warehousebills.fmblno)
+          this.$set(this.form, 'fBsdate', Date.parse(response.data.warehousebills.fbsdate))
+          this.$set(this.form, 'fStorekeeper', response.data.warehousebills.fstorekeeper)
+          this.$set(this.form, 'createBy', response.data.warehousebills.createBy)
+          this.$set(this.form, 'fDeptid', response.data.warehousebills.fdeptid)
+          this.$set(this.form, 'fDilldate', Date.parse(response.data.warehousebills.fbilldate))
+          this.$set(this.form, 'fVslvoy', response.data.warehousebills.fvslvoy)
+          this.$set(this.form, 'fEta', Date.parse(response.data.warehousebills.feta))
+          this.$set(this.form, 'createTime', Date.parse(response.data.warehousebills.createTime))
+          this.$set(this.form, 'fTrademodeid', response.data.warehousebills.ftrademodeid + '')
+          this.$set(this.form, 'fBillingway', response.data.warehousebills.fbillingway + '')
+          this.$set(this.form, 'fFeetunit', response.data.warehousebills.ffeetunit + '')
+          this.$set(this.form, 'fBscorpno', response.data.warehousebills.fbscorpno)
+          this.$set(this.form, 'fCustomno', response.data.warehousebills.fcustomno)
+          this.$set(this.form, 'fStltypeid', response.data.warehousebills.fstltypeid + '')
+          this.$set(this.form, 'fIfweigh', response.data.warehousebills.fifweigh + '')
+          this.$set(this.form, 'fIfdamage', response.data.warehousebills.fifdamage + '')
+          this.$set(this.form, 'fSbu', response.data.warehousebills.fsbu)
+          this.$set(this.form, 'fIfpledge', response.data.warehousebills.fifpledge + '')
+          this.$set(this.form, 'fBankcorpid', response.data.warehousebills.fbankcorpid)
+          this.$set(this.form, 'remark', response.data.warehousebills.remark)
+          this.deptOptions = []
+          this.deptOptions.push(response.data.dept)
+          this.fMblnoOptions = []
+          this.fMblnoOptions.push(response.data.fCorps)
+          if (response.data.fSbu !== null) {
+            this.fSbuOptions = []
+            this.fSbuOptions.push(response.data.fSbu)
+          }
+          if (response.data.warehouse !== null) {
+            this.warehouseOptions = []
+            this.warehouseOptions.push(response.data.warehouse)
+          }
+          if (typeof response.data.warehouseBillsItem !== 'undefined' && response.data.warehouseBillsItem !== null) {
+            this.dataList = response.data.warehouseBillsItem
+            if (response.data.goodsList !== null) {
+              this.goodsOptions = []
+              this.goodsOptions = response.data.goodsList
+            }
+          }
+          this.open = true;
+          this.title = "修改仓库主(出入库)";
+        });
+      },
+      /** 提交按钮 */
+      submitForm() {
+        this.$refs["form"].validate((valid) => {
+          if (valid) {
+            let formData = new window.FormData();
+            // 附件数据
+            formData.append("tWarehouseBills", JSON.stringify(this.form));
+            // 附件数据
+            formData.append("tWhgenleg", null);
+            // 费用明细付款
+            formData.append("tWarehousebillsfeesCr", JSON.stringify(this.warehouseCrList));
+            // 收款
+            formData.append("tWarehousebillsfeesDr", JSON.stringify(this.warehouseDrList));
+            // 库存明细
+            formData.append("tWarehousebillsitems", JSON.stringify(this.dataList));
+            addWarehousebills(formData).then((response) => {
+              console.log(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("删除成功");
           });
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const fIds = row.fId || this.ids;
-      this.$confirm(
-        '是否确认删除仓库主(出入库)编号为"' + fIds + '"的数据项?',
-        "警告",
-        {
+      },
+      /** 导出按钮操作 */
+      handleExport() {
+        const queryParams = this.queryParams;
+        this.$confirm("是否确认导出所有仓库主(出入库)数据项?", "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning",
-        }
-      )
-        .then(function () {
-          return delWarehousebills(fIds);
         })
-        .then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
+          .then(function () {
+            return exportWarehousebills(queryParams);
+          })
+          .then((response) => {
+            this.download(response.msg);
+          });
+      },
+      deleteRow(index, rows) {
+        rows.splice(index, 1)
+      },
+      /* 远程模糊查询用户 */
+      corpsRemoteMethod(name) {
+        if (name == null || name === '') {
+          return false
+        }
+        let queryParams = {pageNum: 1, pageSize: 10, fName: name}
+        listCorps(queryParams).then((response) => {
+          this.fMblnoOptions = response.rows
         });
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm("是否确认导出所有仓库主(出入库)数据项?", "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(function () {
-          return exportWarehousebills(queryParams);
-        })
-        .then((response) => {
-          this.download(response.msg);
+      },
+      /* 远程模糊查询商品 */
+      goodsRemoteMethod(name) {
+        if (name == null || name === '') {
+          return false
+        }
+        let queryParams = {pageNum: 1, pageSize: 10, fName: name}
+        listGoods(queryParams).then((response) => {
+          this.goodsOptions = response.rows
         });
+      },
+      /* 远程模糊查询经营单位 */
+      fSbuRemoteMethod(name) {
+        if (name == null || name === '') {
+          return false
+        }
+        let queryParams = {pageNum: 1, pageSize: 10, fName: name}
+        listCorps(queryParams).then((response) => {
+          this.fSbuOptions = response.rows
+        });
+      },
+      /* 远程模糊查询仓库 */
+      warehouseRemoteMethod(name) {
+        if (name == null || name === '') {
+          return false
+        }
+        let queryParams = {pageNum: 1, pageSize: 10, fName: name}
+        listWarehouse(queryParams).then((response) => {
+          this.warehouseOptions = response.rows
+        });
+      },
+      /* 远程模糊查询操作用户 */
+      userRemoteMethod(name) {
+        if (name == null || name === '') {
+          return false
+        }
+        let queryParams = {pageNum: 1, pageSize: 10, userName: name}
+        listUser(queryParams).then((response) => {
+          this.userOptions = response.rows
+        });
+      },
     },
-    deleteRow(index, rows) {
-      rows.splice(index, 1)
-    },
-    /* 远程模糊查询用户 */
-    corpsRemoteMethod(name) {
-      if (name == null || name === '') {
-        return false
-      }
-      let queryParams = {pageNum: 1, pageSize: 10, fName: name}
-      listCorps(queryParams).then((response) => {
-        this.fMblnoOptions = response.rows
-      });
-    },
-    /* 远程模糊查询商品 */
-    goodsRemoteMethod(name) {
-      if (name == null || name === '') {
-        return false
-      }
-      let queryParams = {pageNum: 1, pageSize: 10, fName: name}
-      listGoods(queryParams).then((response) => {
-        this.goodsOptions = response.rows
-      });
-    },
-    /* 远程模糊查询经营单位 */
-    fSbuRemoteMethod(name) {
-      if (name == null || name === '') {
-        return false
-      }
-      let queryParams = {pageNum: 1, pageSize: 10, fName: name}
-      listCorps(queryParams).then((response) => {
-        this.fSbuOptions = response.rows
-      });
-    },
-    /* 远程模糊查询仓库 */
-    warehouseRemoteMethod(name) {
-      if (name == null || name === '') {
-        return false
-      }
-      let queryParams = {pageNum: 1, pageSize: 10, fName: name}
-      listWarehouse(queryParams).then((response) => {
-        this.warehouseOptions = response.rows
-      });
-    },
-    /* 远程模糊查询操作用户 */
-    userRemoteMethod(name) {
-      if (name == null || name === '') {
-        return false
-      }
-      let queryParams = {pageNum: 1, pageSize: 10, userName: name}
-      listUser(queryParams).then((response) => {
-        this.userOptions = response.rows
-      });
-    },
-  },
-};
+  };
 </script>
+<style lang="scss">
+  .juzhong > th {
+    text-align: center;
+  }
+  .biaoge > tr > td {
+    height: 30px;
+    text-align: center;
+    border-right: 1px solid #dfe6ec !important;
+    order-bottom: 1px solid #dfe6ec !important;
+    border-bottom: 1px solid #dfe6ec !important;
+  }
+  .el-table thead th {
+    background: #1890ff;
+    color: #fff;
+  }
+
+  .upload-demo {
+    margin-left: 50px;
+  }
+
+</style>