Merge branch 'master' of git.echepei.com:zhujiawei/Warehouse_management_ui into master

package.json

@@ -55,6 +55,7 @@
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
     "path-to-regexp": "2.4.0",
+    "print-js": "^1.5.0",
     "quill": "1.3.7",
     "screenfull": "4.2.0",
     "sortablejs": "1.8.4",

src/views/login.vue

@@ -77,8 +77,9 @@ export default {
         ],
         password: [
           { required: true, trigger: "blur", message: "密码不能为空" }
-        ],
-        code: [{ required: true, trigger: "change", message: "验证码不能为空" }]
+        ]
+        /* ,
+        code: [{ required: true, trigger: "change", message: "验证码不能为空" }] */
       },
       loading: false,
       redirect: undefined

src/views/warehouseBusiness/inStock/index.vue

@@ -200,7 +200,18 @@
       <el-table-column label="制单人" align="center" prop="createBy"/>
       <el-table-column label="客户名称" align="center" prop="fcorpid"/>
       <el-table-column label="贸易方式" align="center" prop="ftrademodeid"/>
+      <!-- <el-table-column label="货转客户名称" align="center" prop="fTocorpid" /> -->
       <el-table-column label="入库毛重" align="center" prop="fgrossweight"/>
+      <!-- <el-table-column
+        label="入库日期"
+        align="center"
+        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="fQty"/>
       <el-table-column label="入库毛重" align="center" prop="fGrossweight"/>
       <el-table-column
@@ -221,6 +232,103 @@
         :formatter="fIfpledgeFormat"
       />
       <el-table-column label="质押银行" align="center" prop="fBankcorpid"/>
+      <el-table-column label="业务编号" align="center" prop="fBillno"/>
+      <el-table-column label="报关号" align="center" prop="fCustomno"/>
+      <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"
+        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="提单号"
+        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"
+        align="center"
+        prop="fBilltype"
+        :formatter="fBilltypeFormat"
+      />
+      <el-table-column label="备注" align="center" prop="remark"/>
       <el-table-column
         label="操作"
         align="center"
@@ -267,7 +375,7 @@
         <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: 220px" placeholder="制单人"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -276,6 +384,7 @@
                 v-model="form.fDeptid"
                 filterable
                 disabled
+                style="width: 220px"
                 remote>
                 <el-option
                   v-for="dict in deptOptions"
@@ -290,7 +399,7 @@
             <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"
@@ -307,6 +416,7 @@
                 v-model="form.fCorpid"
                 filterable
                 remote
+                style="width: 220px"
                 :remote-method="corpsRemoteMethod"
                 placeholder="请选择货权方">
                 <el-option
@@ -325,6 +435,7 @@
                 filterable
                 remote
                 :remote-method="userRemoteMethod"
+                style="width: 220px"
                 placeholder="请选择联系人">
                 <el-option
                   v-for="dict in userOptions"
@@ -337,76 +448,26 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="电话" prop="ftel">
-              <el-input v-model="form.fTel" placeholder="请输入电话"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="提单号" prop="fmblno">
-              <el-input v-model="form.fMblno" placeholder="请输入提单号"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="入库日期" prop="fbsdate">
-              <el-date-picker
-                v-model="form.fBsdate"
-                type="date"
-                value-format="timestamp"
-                placeholder="入库日期"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="仓管人" prop="fstorekeeper">
-              <el-input v-model="form.fStorekeeper" placeholder="请输入仓管人"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="制单人" prop="createBy">
-              <el-input disabled v-model="form.createBy" placeholder="制单人"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="制单部门" prop="fDeptid">
-              <el-select
-                v-model="form.fDeptid"
-                filterable
-                disabled
-                remote>
-                <el-option
-                  v-for="dict in deptOptions"
-                  :key="dict.deptId"
-                  :label="dict.deptName"
-                  :value="dict.deptId"
-                ></el-option>
-              </el-select>
+              <el-input v-model="form.fTel" style="width: 220px" placeholder="请输入电话"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
-            <el-form-item disabled label="制单日期" prop="fbilldate">
-              <el-date-picker
-                v-model="form.createTime"
-                type="date"
-                disabled
-                value-format="timestamp"
-                placeholder="制单日期"
-              >
-              </el-date-picker>
+            <el-form-item label="提单号" prop="fmblno">
+              <el-input v-model="form.fMblno" style="width: 220px" 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: 220px" 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: 220px"
                 type="date"
                 value-format="timestamp"
                 placeholder="到港日期"
@@ -419,12 +480,12 @@
         <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: 220px" 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: 220px">
                 <el-option
                   v-for="dict in fTrademodeidOptions"
                   :key="dict.dictValue"
@@ -440,7 +501,7 @@
                 v-model="form.fStltypeid"
                 placeholder="请选择结算方式"
                 clearable
-                size="small"
+                style="width: 220px;"
               >
                 <el-option
                   v-for="dict in fStltypeOptions"
@@ -459,6 +520,7 @@
                 v-model="form.fWarehouseid"
                 filterable
                 remote
+                style="width: 220px"
                 :remote-method="warehouseRemoteMethod"
                 placeholder="请选择仓库">
                 <el-option
@@ -472,13 +534,13 @@
           </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: 220px"/>
             </el-form-item>
           </el-col><el-col :span="8">
           <el-form-item label="入库日期" prop="fbsdate">
             <el-date-picker
               v-model="form.fBsdate"
-              style="width: 375px"
+              style="width: 220px"
               type="date"
               value-format="timestamp"
               placeholder="入库日期"
@@ -494,7 +556,7 @@
                 v-model="form.fIfpledge"
                 placeholder="请选择是否过磅"
                 clearable
-                size="small"
+                style="width: 220px"
               >
                 <el-option
                   v-for="dict in fIfpledgeOptions"
@@ -507,7 +569,7 @@
           </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: 220px"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -517,6 +579,7 @@
                 filterable
                 remote
                 :remote-method="fSbuRemoteMethod"
+                style="width: 220px"
                 placeholder="请选择经营单位">
                 <el-option
                   v-for="dict in fSbuOptions"
@@ -535,7 +598,7 @@
                 v-model="form.fIfweigh"
                 placeholder="请选择是否过磅"
                 clearable
-                size="small"
+                style="width: 220px"
               >
                 <el-option
                   v-for="dict in fIfweighOptions"
@@ -552,7 +615,7 @@
                 v-model="form.fIfdamage"
                 placeholder="请选择是否破损"
                 clearable
-                size="small"
+                style="width: 220px"
               >
                 <el-option
                   v-for="dict in fIfdamageOptions"
@@ -565,7 +628,7 @@
           </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: 220px" laceholder="客户存货编号"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -575,7 +638,7 @@
               <el-select v-model="form.fBillingway "
                          placeholder="请选择计费方式"
                          clearable
-                         size="small"
+                         style="width: 220px"
               >
                 <el-option
                   v-for="dict in fFeetunitOptions"
@@ -587,8 +650,20 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="银行名称" prop="fbankcorpid">
-              <el-input v-model="form.fBankcorpid" laceholder="银行名称"/>
+            <el-form-item label="计费单位" prop="ffeetunit">
+              <el-select
+                v-model="form.fFeetunit"
+                placeholder="请选择计费单位"
+                clearable
+                style="width: 220px"
+              >
+                <el-option
+                  v-for="dict in fFeetunitOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -1364,14 +1439,294 @@
         </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 print from 'print-js'
   import {
     listWarehousebills,
     getWarehousebills,
@@ -1404,6 +1759,10 @@
           deptId: null
         },
         queryForm: {},
+        // 添加用户对话框
+      editDialogVisible_s: false,
+      editDialogVisible_ss: false,
+      editDialogClosed_ss: false,
         dataList: [],
         warehouseCrList: [],
         warehouseDrList: [],
@@ -1563,6 +1922,17 @@
       });
     },
     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))
@@ -1584,14 +1954,14 @@
           remark: null
         });
       },
-      addRelevt(){
-        this.relevantAttachments.push({
-          attachName:null,
-          opUserName:null,
-          opDate:null,
-          attachId:null,
-        })
-      },
+      // 收货单打印界面
+    showEditDialog_s() {
+      console.log("@@@@");
+      this.editDialogVisible_s = true;
+    },
+    showEditDialog_ss() {
+      this.editDialogVisible_ss = true;
+    },
       // 收款信息
       addCollection() {
         var obj = {};
@@ -1726,8 +2096,6 @@
         this.single = selection.length !== 1;
         this.multiple = !selection.length;
       },
-      checkType() {
-      },
       /** 新增按钮操作 */
       handleAdd() {
         this.reset();
@@ -1793,29 +2161,17 @@
       submitForm() {
         this.$refs["form"].validate((valid) => {
           if (valid) {
-            // let formData = new FormData()
-            // console.log(JSON.stringify(this.form));
-            // formData.append('tWarehouseBills', JSON.stringify(this.formData))
             let formData = new window.FormData();
             // 附件数据
             formData.append("tWarehouseBills", JSON.stringify(this.form));
-            console.log(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));
-            // 附件数据
-            // formData.append('tWhgenleg', dataForm)
-            // // 费用明细付款
-            // formData.append('tWarehousebillsfeesCr', dataForm)
-            // // 收款
-            // formData.append('tWarehousebillsfeesDr"', dataForm)
-            // // 库存明细
-            // formData.append('tWarehousebillsitems', dataForm)
             addWarehousebills(formData).then((response) => {
               console.log(response);
               this.msgSuccess("新增成功");
@@ -1916,3 +2272,24 @@
     },
   };
 </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>