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

src/api/warehouseBusiness/goodsTransfer.js

@@ -17,6 +17,7 @@ export function getGoodsTransferList(query) {
     params: query
   })
 }
+
 // 入库详情信息入账
 export function addWhgenleg(data) {
   return request({
@@ -26,6 +27,15 @@ export function addWhgenleg(data) {
   })
 }
 
+// 撤销货转确认
+export function updateCredit (data) {
+  return request({
+    url: '/warehouseBusiness/goodsTransfer/updateCredit',
+    method: 'post',
+    data: data
+  })
+}
+
 // 查询仓库主(出入库)详细
 export function getGoodsTransfer(fId) {
   return request({
@@ -34,7 +44,7 @@ export function getGoodsTransfer(fId) {
   })
 }
 
-// 新增仓库主(出入库)
+// 货权转移暂存
 export function addGoodsTransfer(data) {
   return request({
     url: '/warehouseBusiness/goodsTransfer/add',
@@ -43,6 +53,15 @@ export function addGoodsTransfer(data) {
   })
 }
 
+// 货权转移提交
+export function warehouseSubmission(data) {
+  return request({
+    url: '/warehouseBusiness/goodsTransfer/warehouseSubmission',
+    method: 'post',
+    data: data
+  })
+}
+
 // 修改仓库主(出入库)
 export function updateGoodsTransfer(data) {
   return request({

src/views/finance/charge/index.vue

@@ -506,6 +506,7 @@ export default {
   components: {},
   data() {
     return {
+      openPrint:false,
       browseStatus: true,
       nothing: [],
       //打印表

src/views/warehouseBusiness/goodsTransfer/index.vue

@@ -167,10 +167,10 @@
           icon="el-icon-search"
           size="mini"
           @click="handleQuery"
-          >搜索
+        >搜索
         </el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-          >重置
+        >重置
         </el-button>
       </el-form-item>
     </el-form>
@@ -182,7 +182,7 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['warehouseBusiness:goodsTransfer:add']"
-          >新增
+        >新增
         </el-button>
       </el-col>
       <el-col :span="1.5">
@@ -193,18 +193,7 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['warehouseBusiness:goodsTransfer:edit']"
-          >修改
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['warehouseBusiness:goodsTransfer:remove']"
-          >删除
+        >修改
         </el-button>
       </el-col>
       <el-col :span="1.5">
@@ -214,7 +203,7 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['warehouseBusiness:goodsTransfer:export']"
-          >导出
+        >导出
         </el-button>
       </el-col>
       <right-toolbar
@@ -228,8 +217,8 @@
       :data="goodsTransferList"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column type="index" label="行号" align="center" />
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column type="index" label="行号" align="center"/>
       <el-table-column
         :show-overflow-tooltip="true"
         label="货权方"
@@ -242,7 +231,7 @@
         align="center"
         prop="fTocorpid"
       />
-      <el-table-column label="提单号" align="center" prop="fMblno" />
+      <el-table-column label="提单号" align="center" prop="fMblno"/>
       <!-- <el-table-column :show-overflow-tooltip="true" label="经营单位" align="center" prop="fSbu" /> -->
       <el-table-column
         :show-overflow-tooltip="true"
@@ -261,8 +250,9 @@
         align="center"
         prop="fBsdate"
         width="180"
-        ><template slot-scope="scope">
-          <span>{{ parseTime(scope.row.fBsdate, "{y}-{m}-{d}") }}</span>
+      >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.fBsdate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column
@@ -271,10 +261,10 @@
         prop="fTrademodeid"
         :formatter="fTrademodeidFormat"
       />
-      <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="fNetweight" />
+      <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="fNetweight"/>
       <el-table-column
         label="操作"
         align="center"
@@ -286,26 +276,37 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
+            v-if="scope.row.fBillstatus === 6"
             @click="handleUpdate(scope.row, true)"
             v-hasPermi="['warehouseBusiness:goodsTransfer:edit']"
-            >查看
+          >查看
           </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
+            v-if="scope.row.fBillstatus !== 6"
             @click="handleUpdate(scope.row, false)"
             v-hasPermi="['warehouseBusiness:goodsTransfer:edit']"
-            >修改
+          >修改
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            v-if="scope.row.fBillstatus > 3 && scope.row.fBillstatus < 6"
+            @click="handleUpdate(scope.row, false)"
+            v-hasPermi="['warehouseBusiness:goodsTransfer:edit']"
+          >查看审批
           </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
-            v-if="scope.row.fBillstatus !== '6'"
+            v-if="scope.row.fBillstatus !== 6"
             @click="handleDelete(scope.row)"
             v-hasPermi="['warehouseBusiness:goodsTransfer:remove']"
-            >删除
+          >删除
           </el-button>
         </template>
       </el-table-column>
@@ -333,7 +334,7 @@
                 v-model="form.fCorpid"
                 filterable
                 remote
-                :disabled="browseStatus"
+                :disabled="browseStatus || formBrowseStatus"
                 style="width: 80%"
                 :remote-method="corpsRemoteMethod"
                 placeholder="请选择货权方"
@@ -353,7 +354,7 @@
                 v-model="form.fTocorpid"
                 filterable
                 remote
-                :disabled="browseStatus"
+                :disabled="browseStatus || formBrowseStatus"
                 style="width: 80%"
                 :remote-method="corpsRemoteMethod"
                 placeholder="请选择新货权方"
@@ -368,40 +369,24 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="制单人" prop="createBy">
+            <el-form-item label="业务编号" prop="fBillno">
               <el-input
-                disabled
-                v-model="form.createBy"
+                v-model="form.fBillno"
                 style="width: 80%"
-                placeholder="制单人"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="制单部门" prop="fDeptid">
-              <el-select
-                v-model="form.fDeptid"
-                filterable
                 disabled
-                style="width: 80%"
-                remote
-              >
-                <el-option
-                  v-for="(dict, index) in deptOptions"
-                  :key="index.deptId"
-                  :label="dict.deptName"
-                  :value="dict.deptId"
-                ></el-option>
-              </el-select>
+                placeholder="业务编号"
+              />
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="8">
             <el-form-item label="货转日期" prop="fBsdate">
               <el-date-picker
                 v-model="form.fBsdate"
                 style="width: 80%"
                 type="date"
-                :disabled="browseStatus"
+                :disabled="browseStatus || formBrowseStatus"
                 value-format="timestamp"
                 placeholder="货转日期"
               >
@@ -414,13 +399,31 @@
                 v-model="form.fChargedate"
                 style="width: 80%"
                 type="date"
-                :disabled="browseStatus"
+                :disabled="browseStatus || formBrowseStatus"
                 value-format="timestamp"
-                placeholder="仓储计费日期"
-              >
+                placeholder="仓储计费日期">
               </el-date-picker>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="仓库" prop="fWarehouseid">
+              <el-select
+                v-model="form.fWarehouseid"
+                filterable
+                :disabled="browseStatus || formBrowseStatus"
+                remote
+                style="width: 80%"
+                :remote-method="warehouseRemoteMethod"
+                placeholder="请选择仓库">
+                <el-option
+                  v-for="(dict, index) in warehouseOptions"
+                  :key="index.fId"
+                  :label="dict.fName"
+                  :value="dict.fId"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
@@ -429,7 +432,7 @@
                 v-model="form.fStltypeid"
                 placeholder="请选择结算方式"
                 clearable
-                :disabled="browseStatus"
+                :disabled="browseStatus || formBrowseStatus"
                 style="width: 80%"
               >
                 <el-option
@@ -447,7 +450,7 @@
                 v-model="form.fFeetunit"
                 placeholder="请选择计费单位"
                 clearable
-                :disabled="browseStatus"
+                :disabled="browseStatus || formBrowseStatus"
                 style="width: 80%"
               >
                 <el-option
@@ -465,7 +468,7 @@
                 v-model="form.fTrademodeid"
                 placeholder="请选择贸易方式"
                 clearable
-                :disabled="browseStatus"
+                :disabled="browseStatus || formBrowseStatus"
                 style="width: 80%"
               >
                 <el-option
@@ -478,7 +481,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-
         <el-row>
           <el-col :span="8">
             <el-form-item label="提单号" prop="fMblno">
@@ -518,68 +520,61 @@
         </el-row>
         <el-row>
           <el-col :span="8">
-            <el-form-item label="仓库" prop="fWarehouseid">
-              <el-select
-                v-model="form.fWarehouseid"
-                filterable
-                :disabled="browseStatus"
-                remote
+            <el-form-item label="唛头" prop="fMarks">
+              <el-input
+                v-model="form.fMarks"
                 style="width: 80%"
-                :remote-method="warehouseRemoteMethod"
-                placeholder="请选择仓库"
-              >
-                <el-option
-                  v-for="(dict, index) in warehouseOptions"
-                  :key="index.fId"
-                  :label="dict.fName"
-                  :value="dict.fId"
-                ></el-option>
-              </el-select>
+                disabled
+                placeholder="唛头"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="唛头" prop="fMarks">
+            <el-form-item label="品名" prop="fProductName">
               <el-input
-                v-model="form.fMarks"
+                v-model="form.fProductName"
                 style="width: 80%"
-                :disabled="browseStatus"
-                placeholder="唛头"
+                disabled
+                placeholder="品名"
               />
-            </el-form-item> </el-col
-          ><el-col :span="8">
-            <el-form-item label="业务编号" prop="fBillno">
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="制单人" prop="createBy">
               <el-input
-                v-model="form.fBillno"
+                disabled
+                v-model="form.createBy"
                 style="width: 80%"
-                :disabled="browseStatus"
-                placeholder="业务编号"
+                placeholder="制单人"
               />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-button type="primary" @click="submitForm(2)">保 存</el-button>
-        <el-button type="primary" @click="submitForm(6)">请核</el-button>
+        <el-button type="primary" @click="saveForm">保 存</el-button>
+        <el-button type="primary" @click="submitForm">请 核</el-button>
       </el-form>
       <div class="dialogTableTitle flex a-center jlr">
-        <h3>入库明细</h3>
+        <h3>货转明细</h3>
         <el-button :disabled="browseStatus" @click.prevent="addRelevant()"
-          >新增</el-button
+        >新增
+        </el-button
         >
         <el-button
           :disabled="dataListSelection.length <= 0"
           @click.prevent="creditClick()"
-          >货转确认
+        >货转确认
         </el-button>
         <el-button
-            :disabled="dataWithdrawList.length <= 0"
-            @click.prevent="withdrawClick"
-            >撤回货转</el-button
-          >
-        <el-button type="primary" @click="submitForm(2)">保 存</el-button>
+          :disabled="dataWithdrawList.length <= 0"
+          @click.prevent="withdrawClick"
+        >撤回货转
+        </el-button
+        >
+        <el-button type="primary" @click="saveForm">保 存</el-button>
       </div>
       <el-table
         :data="dataList"
-        ref="tableList"
+        ref="tableListRef"
         tooltip-effect="dark"
         border
         stripe
@@ -587,7 +582,7 @@
         @selection-change="Selectinventory"
         show-summary
       >
-        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column type="selection" width="55" align="center"/>
         <el-table-column label="序号" type="index" width="80">
         </el-table-column>
         <el-table-column
@@ -597,14 +592,6 @@
           width="140px"
           label="品名"
         >
-        <template slot-scope="scope">
-            <el-input
-              v-model="scope.row.fGoodsids"
-              placeholder="品名"
-              :disabled="browseStatus || scope.row.fBillstatus === '6'"
-              show-word-limit
-            />
-          </template>
         </el-table-column>
         <el-table-column
           prop="fMarks"
@@ -613,57 +600,22 @@
           width="140px"
           label="唛头"
         >
-         <template slot-scope="scope">
-            <el-input
-              v-model="scope.row.fMarks"
-              placeholder="唛头"
-              :disabled="browseStatus || scope.row.fBillstatus === '6'"
-              show-word-limit
-            />
-          </template>
         </el-table-column>
         <el-table-column
           prop="fMblno"
           header-align="center"
           align="center"
           width="140px"
-        
           label="提单号"
         >
-        <template slot-scope="scope">
-            <el-input
-              v-model="scope.row.fGoodsids"
-              placeholder="提单号"
-              :disabled="browseStatus || scope.row.fBillstatus === '6'"
-              show-word-limit
-            />
-          </template>
         </el-table-column>
         <el-table-column
           prop="fWarehouselocids"
           header-align="center"
           width="150px"
           align="center"
-         
           label="*库区"
         >
-        <template slot-scope="scope">
-            <el-select
-              v-model="scope.row.fWarehouselocid"
-              filterable
-              remote
-              :disabled="browseStatus || scope.row.fBillstatus === '6'"
-              :remote-method="kqhouseRemoteMethod"
-              placeholder="请选择库区"
-            >
-              <el-option
-                v-for="(dict, index) in kqhouseOptions"
-                :key="index.fId"
-                :label="dict.fName"
-                :value="dict.fId"
-              ></el-option>
-            </el-select>
-          </template>
         </el-table-column>
         <el-table-column
           prop="fOriginalbillno"
@@ -672,27 +624,19 @@
           width="140px"
           label="原始入库单号"
         >
-        <template slot-scope="scope">
-            <el-input
-              v-model="scope.row.fOriginalbillno"
-              placeholder="原始入库单号"
-              :disabled="browseStatus || scope.row.fBillstatus === '6'"
-              show-word-limit
-            />
-          </template>
         </el-table-column>
         <el-table-column
           prop="fPlanqty"
           header-align="center"
           align="center"
           width="180px"
-          label="库存件数"
+          label="*库存件数"
         >
-        <template slot-scope="scope">
+          <template slot-scope="scope">
             <el-input
               v-model="scope.row.fPlanqty"
               placeholder="库存件数"
-              :disabled="browseStatus || scope.row.fBillstatus === '6'"
+              disabled
               show-word-limit
             />
           </template>
@@ -704,11 +648,11 @@
           width="180px"
           label="*库存毛重"
         >
-        <template slot-scope="scope">
+          <template slot-scope="scope">
             <el-input
               v-model="scope.row.fPlangrossweight"
               placeholder="库存毛重"
-              :disabled="browseStatus || scope.row.fBillstatus === '6'"
+              disabled
               show-word-limit
             />
           </template>
@@ -720,11 +664,11 @@
           align="center"
           label="*库存净重"
         >
-        <template slot-scope="scope">
+          <template slot-scope="scope">
             <el-input
               v-model="scope.row.fPlannetweight"
               placeholder="库存净重"
-              :disabled="browseStatus || scope.row.fBillstatus === '6'"
+              disabled
               show-word-limit
             />
           </template>
@@ -741,8 +685,8 @@
               oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
               @change="qtyChange(scope.row)"
               v-model="scope.row.fQty"
-              placeholder="货转件数"
-              :disabled="browseStatus || scope.row.fBillstatus === '6'"
+              placeholder="*货转件数"
+              :disabled="browseStatus || scope.row.fBillstatus === 6"
               show-word-limit
             />
           </template>
@@ -752,14 +696,14 @@
           header-align="center"
           width="180px"
           align="center"
-          label="货转毛重"
+          label="*货转毛重"
         >
           <template slot-scope="scope">
             <el-input
               oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d\d\d\d).*$/, "$1$2.$3")'
               v-model="scope.row.fGrossweight"
               placeholder="货转毛重"
-              :disabled="browseStatus || scope.row.fBillstatus === '6'"
+              :disabled="browseStatus || scope.row.fBillstatus === 6"
               show-word-limit
             />
           </template>
@@ -769,14 +713,14 @@
           header-align="center"
           width="180px"
           align="center"
-          label="货转净重"
+          label="*货转净重"
         >
           <template slot-scope="scope">
             <el-input
               oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d\d\d\d).*$/, "$1$2.$3")'
               v-model="scope.row.fNetweight"
               placeholder="货转净重"
-              :disabled="browseStatus || scope.row.fBillstatus === '6'"
+              :disabled="browseStatus || scope.row.fBillstatus === 6"
               show-word-limit
             />
           </template>
@@ -793,7 +737,7 @@
               oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
               v-model="scope.row.fCntqty"
               placeholder="箱量"
-              :disabled="browseStatus || scope.row.fBillstatus === '6'"
+              :disabled="browseStatus || scope.row.fBillstatus === 6"
               show-word-limit
             />
           </template>
@@ -807,9 +751,8 @@
         >
           <template slot-scope="scope">
             <el-input
-              oninput="value=value.replace(/[^\d.]/g,'')"
               v-model="scope.row.fPackagespecs"
-              :disabled="browseStatus || scope.row.fBillstatus === '6'"
+              :disabled="browseStatus || scope.row.fBillstatus === 6"
               placeholder="包装规格"
               show-word-limit
             />
@@ -824,10 +767,10 @@
         >
           <template slot-scope="scope">
             <el-input
-              oninput="value=value.replace(/[^\d.]/g,'')"
+              oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
               v-model="scope.row.fGoodsval"
               placeholder="货值"
-              :disabled="browseStatus || scope.row.fBillstatus === '6'"
+              :disabled="browseStatus || scope.row.fBillstatus === 6"
               show-word-limit
             />
           </template>
@@ -843,7 +786,7 @@
             <el-input
               v-model="scope.row.remark"
               placeholder="备注"
-              :disabled="browseStatus || scope.row.fBillstatus === '6'"
+              :disabled="browseStatus || scope.row.fBillstatus === 6"
               show-word-limit
             />
           </template>
@@ -856,14 +799,8 @@
           label="状态"
         >
           <template slot-scope="scope">
-            <span v-if="scope.row.fBillstatus === '6'">已入账</span>
-            <span v-else>未入账</span>
-            <!-- <el-input
-              v-model="scope.row.fBillstatus"
-              placeholder="状态"
-              :disabled="browseStatus"
-              show-word-limit
-            /> -->
+            <span v-if="scope.row.fBillstatus === 6">货转</span>
+            <span v-else>录入</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -874,10 +811,11 @@
         >
           <template slot-scope="scope">
             <el-button
-              :disabled="browseStatus || scope.row.fBillstatus === '6'"
+              :disabled="browseStatus || scope.row.fBillstatus === 6"
               @click.native.prevent="deleteRow(scope.$index, dataList)"
               size="small"
-              >移除</el-button
+            >移除
+            </el-button
             >
           </template>
         </el-table-column>
@@ -885,13 +823,13 @@
       <div class="dialogTableTitle flex a-center jlr">
         <h3>附件上传</h3>
         <el-button :disabled="browseStatus" @click.prevent="addRelevt()"
-          >新增
+        >新增
         </el-button>
-        <el-button type="primary" @click="submitForm(2)">保 存</el-button>
+        <el-button type="primary" @click="saveForm">保 存</el-button>
       </div>
       <el-table
         :data="relevantAttachments"
-        ref="table"
+        ref="attachTable"
         tooltip-effect="dark"
         border
         stripe
@@ -955,7 +893,7 @@
           label="上传附件"
         >
           <template slot-scope="scope">
-            <uploadFile @input="showFile" v-model="scope.row.fUrl" />
+            <uploadFile @input="showFile" v-model="scope.row.fUrl"/>
           </template>
         </el-table-column>
         <el-table-column
@@ -971,7 +909,7 @@
               "
               :disabled="browseStatus"
               size="small"
-              >移除
+            >移除
             </el-button>
           </template>
         </el-table-column>
@@ -979,13 +917,13 @@
       <div class="dialogTableTitle flex a-center jlr">
         <h3>收款信息</h3>
         <el-button :disabled="browseStatus" @click.prevent="addCollection()"
-          >新增
+        >新增
         </el-button>
-        <el-button type="primary" @click="submitForm(2)">保 存</el-button>
+        <el-button type="primary" @click="saveForm">保 存</el-button>
       </div>
       <el-table
         :data="warehouseDrList"
-        ref="table"
+        ref="warehouseDr"
         tooltip-effect="dark"
         border
         stripe
@@ -1053,14 +991,14 @@
         >
           <template slot-scope="scope">
             <el-select
-              v-model="scope.row.fFeeUnitid"
+              v-model="scope.row.fFeeunitid"
               placeholder="请选择计价单位"
               :disabled="browseStatus"
               @change="changeFeeUnit(scope.row)"
               clearable
             >
               <el-option
-                v-for="(dict, index) in jFeetunitOptions"
+                v-for="(dict, index) in fFeetunitOptions"
                 :key="index.dictValue"
                 :label="dict.dictLabel"
                 :value="dict.dictValue"
@@ -1196,7 +1134,8 @@
             <el-button
               @click.native.prevent="deleteRow(scope.$index, warehouseDrList)"
               size="small"
-              >移除</el-button
+            >移除
+            </el-button
             >
           </template>
         </el-table-column>
@@ -1204,13 +1143,13 @@
       <div class="dialogTableTitle flex a-center jlr">
         <h3>付款信息</h3>
         <el-button :disabled="browseStatus" @click.prevent="addpayment()"
-          >新增
+        >新增
         </el-button>
-        <el-button type="primary" @click="submitForm(2)">保 存</el-button>
+        <el-button type="primary" @click="saveForm">保 存</el-button>
       </div>
       <el-table
         :data="warehouseCrList"
-        ref="table"
+        ref="warehouseCr"
         tooltip-effect="dark"
         border
         stripe
@@ -1270,7 +1209,7 @@
           </template>
         </el-table-column>
         <el-table-column
-          prop="fFeeUnitid"
+          prop="fFeeunitid"
           header-align="center"
           align="center"
           width="180px"
@@ -1278,7 +1217,7 @@
         >
           <template slot-scope="scope">
             <el-select
-              v-model="scope.row.fFeeUnitid"
+              v-model="scope.row.fFeeunitid"
               filterable
               remote
               :disabled="browseStatus"
@@ -1287,7 +1226,7 @@
               placeholder="计价单位"
             >
               <el-option
-                v-for="(dict, index) in jFeetunitOptions"
+                v-for="(dict, index) in fFeetunitOptions"
                 :key="index.dictValue"
                 :label="dict.dictLabel"
                 :value="dict.dictValue"
@@ -1424,14 +1363,15 @@
               @click.native.prevent="deleteRow(scope.$index, warehouseCrList)"
               :disabled="browseStatus"
               size="small"
-              >移除</el-button
+            >移除
+            </el-button
             >
           </template>
         </el-table-column>
       </el-table>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm(2)">保 存</el-button>
-        <el-button type="primary" @click="submitForm(6)">提交审核</el-button>
+        <el-button type="primary" @click="saveForm">保 存</el-button>
+        <el-button type="primary" @click="submitForm">提交审核</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
       <!-- 选择库存总账数据 -->
@@ -1451,7 +1391,7 @@
           stripe
           @selection-change="whgenlegSelectionChange"
         >
-          <el-table-column type="selection" width="55"> </el-table-column>
+          <el-table-column type="selection" width="55"></el-table-column>
           <el-table-column
             prop="fMblno"
             header-align="center"
@@ -1468,7 +1408,7 @@
           >
           </el-table-column>
           <el-table-column
-            prop="fGoodsid"
+            prop="fGoodsids"
             header-align="center"
             align="center"
             label="品名"
@@ -1482,7 +1422,7 @@
           >
           </el-table-column>
           <el-table-column
-            prop="fWarehouseLocationid"
+            prop="fWarehouseLocationids"
             header-align="center"
             align="center"
             label="库区"
@@ -1506,1123 +1446,1065 @@
 </template>
 
 <script>
-import print from "print-js";
-import {
-  addWhgenleg,
-  listGoodsTransfer,
-  getGoodsTransfer,
-  addGoodsTransfer,
-  updateGoodsTransfer,
-  delGoodsTransfer,
-  exportGoodsTransfer,
-} from "@/api/warehouseBusiness/goodsTransfer";
-import { updateCredit } from "@/api/warehouseBusiness/warehouseInStock";
-import { listCorps } from "@/api/basicdata/corps";
+  import print from 'print-js'
+  import {
+    addWhgenleg,
+    listGoodsTransfer,
+    getGoodsTransfer,
+    addGoodsTransfer,
+    warehouseSubmission,
+    delGoodsTransfer,
+    exportGoodsTransfer
+  } from '@/api/warehouseBusiness/goodsTransfer'
+  import { updateCredit } from '@/api/warehouseBusiness/goodsTransfer'
+  import { listCorps } from '@/api/basicdata/corps'
 
-import { listFees } from "@/api/basicdata/fees";
+  import { listFees } from '@/api/basicdata/fees'
 
-import { listWarehouse } from "@/api/basicdata/warehouse";
+  import { listWarehouse } from '@/api/basicdata/warehouse'
 
-import { listArea } from "@/api/basicdata/area";
+  import { listArea } from '@/api/basicdata/area'
 
-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'
 
-import { listWhgenleg } from "@/api/reportManagement/whgenleg";
+  import { listWhgenleg } from '@/api/reportManagement/whgenleg'
 
-import UploadFile from "@/components/Uploadfile";
-export default {
-  name: "goodsTransfer",
-  components: {
-    UploadFile,
-  },
-  data() {
-    return {
-      // 修改查看状态
-      browseStatus: false,
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      userVal: {
-        userName: null,
-        nickName: null,
-        deptId: null,
-      },
-      queryForm: {},
-      // 添加用户对话框
-      editDialogVisible_s: false,
-      editDialogVisible_ss: false,
-      editDialogClosed_ss: false,
-      dataList: [],
-      warehouseCrList: [],
-      warehouseDrList: [],
-      Printinglist: [],
-      relevantAttachments: [],
-      fPlannetweight: '',
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 仓库主(出入库)表格数据
-      goodsTransferList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 货权方(客户数据)
-      fMblnoOptions: [],
-      // 货权方(客户数据)
-      // 客户名称
-      KHblnoOptions: [],
-      fSbuOptions: [],
-      // 操作员
-      userOptions: [],
-      // 操作员
-      goodsOptions: [],
-      // 库存明细入账数组
-      dataListSelection: [],
-      // 库存明细撤回入账数组
-      dataWithdrawList: [],
-      // 制单部门
-      deptOptions: [],
-      // 仓库(仓库
-      warehouseOptions: [],
-      kqhouseOptions: [],
-      // 贸易方式(数据字典),对应t_trademodels 字典
-      fTrademodeidOptions: [],
-      // 计费单位(数据字典),下拉选择毛重或净重字典
-      fFeetunitOptions: [],
-      // 结算方式(数据字典),下拉选择字典
-      fStltypeOptions: [],
-      // 是否过磅(数据字典)默认 F ,过磅T 否者F 下拉选择字典
-      fIfweighOptions: [],
-      // 是否质押(数据字典),默认 F ,质押T 否者F 下拉选择字典
-      fIfpledgeOptions: [],
-      // 是否破损(数据字典),默认F否则T字典
-      fIfdamageOptions: [],
-      // 单据类型(数据字典)SJRK字典
-      fBilltypeOptions: [],
-      // 状态(数据字典),N 入字典
-      fBillstatusOptions: [],
-      // 费用名称
-      fWbuOptions: [],
-      // 计价单位
-      jFeetunitOptions: [],
-      // 查询参数
-      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,
-      },
-      // 日期区间
-      orgStorageDate: null,
-      // 表单参数
-      form: {},
-      // 库存总账参数
-      whgenlegParams: {
-        pageNum: 1,
-        pageSize: 10,
-        fMblno: null,
-        fCorpid: null,
-        fWarehouseid: null,
-        fTrademodeid: null,
-        orgStorageDate: null,
-      },
-      // 库存总账表
-      whgenlegList: [],
-      whgenlegTotal: 0,
-      // 弹窗库存总账数据
-      dialogWhgenlegList: [],
-      // 库存总账对话框
-      whgenlegVisible: false,
-      // 表单校验
-      rules: {
-        fDeptid: [{ required: true, message: " ", trigger: "blur" }],
-        fMblno: [{ required: true, message: " ", trigger: "blur" }],
-        fBsdeptid: [{ required: true, message: " ", trigger: "blur" }],
-        fCorpid: [
-          {
-            required: true,
-            message: " ",
-            trigger: "blur",
-          },
-        ],
-        fBsdate: [{ required: true, message: " ", trigger: "blur" }],
-        fTrademodeid: [{ required: true, message: " ", trigger: "blur" }],
-        fSbu: [{ required: true, message: " ", trigger: "blur" }],
-        fStorekeeper: {
-          required: true,
-          message: " ",
-          trigger: "blur",
+  import UploadFile from '@/components/Uploadfile'
+
+  export default {
+    name: 'goodsTransfer',
+    components: {
+      UploadFile
+    },
+    data() {
+      return {
+        // 修改查看状态
+        browseStatus: false,
+        // 是否有明细入库
+        formBrowseStatus: false,
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        ids: [],
+        userVal: {
+          userName: null,
+          nickName: null,
+          deptId: null
         },
-        fWarehouseid: [{ required: true, message: " ", trigger: "blur" }],
-        fbillingway: [
-          {
-            required: true,
-            message: " ",
-            trigger: "blur",
-          },
+        queryForm: {},
+        // 添加用户对话框
+        editDialogVisible_s: false,
+        editDialogVisible_ss: false,
+        editDialogClosed_ss: false,
+        dataList: [],
+        warehouseCrList: [],
+        warehouseDrList: [],
+        relevantAttachments: [],
+        fPlannetweight: '',
+        // 税率
+        fTaxrate: null,
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        // 仓库主(出入库)表格数据
+        goodsTransferList: [],
+        // 弹出层标题
+        title: '',
+        // 是否显示弹出层
+        open: false,
+        // 货权方(客户数据)
+        fMblnoOptions: [],
+        // 货权方(客户数据)
+        // 客户名称
+        KHblnoOptions: [],
+        fSbuOptions: [],
+        // 操作员
+        userOptions: [],
+        // 操作员
+        goodsOptions: [],
+        // 库存明细入账数组
+        dataListSelection: [],
+        // 库存明细撤回入账数组
+        dataWithdrawList: [],
+        // 仓库(仓库
+        warehouseOptions: [],
+        kqhouseOptions: [],
+        // 贸易方式(数据字典),对应t_trademodels 字典
+        fTrademodeidOptions: [],
+        // 计费单位(数据字典),下拉选择毛重或净重字典
+        fFeetunitOptions: [
+          { dictLabel: "件数", dictValue: 1 },
+          { dictLabel: "毛重", dictValue: 2 },
+          { dictLabel: "净重", dictValue: 3 },
+          { dictLabel: "尺码", dictValue: 4 },
+          { dictLabel: "固定", dictValue: 5 }
         ],
-        fTocorpid: [
-          {
+        // 结算方式(数据字典),下拉选择字典
+        fStltypeOptions: [],
+        // 是否过磅(数据字典)默认 F ,过磅T 否者F 下拉选择字典
+        fIfweighOptions: [],
+        // 是否质押(数据字典),默认 F ,质押T 否者F 下拉选择字典
+        fIfpledgeOptions: [],
+        // 是否破损(数据字典),默认F否则T字典
+        fIfdamageOptions: [],
+        // 单据类型(数据字典)SJRK字典
+        fBilltypeOptions: [],
+        // 状态(数据字典),N 入字典
+        fBillstatusOptions: [],
+        // 费用名称
+        fWbuOptions: [],
+        // 查询参数
+        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
+        },
+        // 日期区间
+        orgStorageDate: null,
+        // 表单参数
+        form: {},
+        // 库存总账参数
+        whgenlegParams: {
+          pageNum: 1,
+          pageSize: 10,
+          fMblno: null,
+          fCorpid: null,
+          fWarehouseid: null,
+          fTrademodeid: null,
+          orgStorageDate: null
+        },
+        // 库存总账表
+        whgenlegList: [],
+        whgenlegTotal: 0,
+        // 弹窗库存总账数据
+        dialogWhgenlegList: [],
+        // 库存总账对话框
+        whgenlegVisible: false,
+        // 表单校验
+        rules: {
+          fBsdeptid: [{ required: true, message: ' ', trigger: 'blur' }],
+          fCorpid: [{ required: true, message: ' ', trigger: 'blur' }],
+          fBsdate: [{ required: true, message: ' ', trigger: 'blur' }],
+          fFeetunit: [{ required: true, message: ' ', trigger: 'blur' }],
+          fChargedate: [{ required: true, message: ' ', trigger: 'blur' }],
+          fTrademodeid: [{ required: true, message: ' ', trigger: 'blur' }],
+          fSbu: [{ required: true, message: ' ', trigger: 'blur' }],
+          fStorekeeper: {
             required: true,
-            message: " ",
-            trigger: "blur",
+            message: ' ',
+            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.jFeetunitOptions = JSON.parse(JSON.stringify(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: {
-    // 上传成功返回数据
-    showFile(row) {
-      // this.$set(this.relevantAttachments[0], 'fName', row.fileName)
-      this.$set(this.relevantAttachments[0], "fUrl", row.url);
-    },
-    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,
-      });
-    },
-      // 新增附件上传
-    addRelevt() {
-      console.log(this.relevantAttachments)
-      this.relevantAttachments.push({
-        fUrl: null,
-        fName: null,
-        createBy: this.form.createBy,
-        createTime: Date.parse(new Date()),
-      });
-    },
-    // 添加list
-    addRelevant() {
-      if (
-        !this.form.fCorpid ||
-        !this.form.fTrademodeid ||
-        !this.form.fWarehouseid
-      ) {
-        this.$message({
-          message: "请维护货权方、贸易方式、仓库",
-          type: "warning",
-        });
-        return false;
-      }
-      this.whgenlegList = [];
-      this.dialogWhgenlegList = [];
-      this.whgenlegTotal = 0;
-      this.whgenlegVisible = true;
-      this.getWhgenlegList();
-    },
-    // 查询库存总账信息
-    getWhgenlegList() {
-      this.whgenlegParams.fMblno = this.form.fMblno;
-      this.whgenlegParams.fCorpid = this.form.fCorpid;
-      this.whgenlegParams.fWarehouseid = this.form.fWarehouseid;
-      this.whgenlegParams.fTrademodeid = this.form.fTrademodeid;
-      this.whgenlegParams.orgStorageDate = this.orgStorageDate;
-      listWhgenleg(this.whgenlegParams).then((response) => {
-        this.whgenlegList = response.rows;
-        this.whgenlegTotal = response.total;
-      });
-    },
-    // 库存总账多选框
-    whgenlegSelectionChange(selection) {
-      this.dialogWhgenlegList = selection;
-    },
-    // 库存总账导出数据
-    whgenlegData() {
-      if (this.dialogWhgenlegList.length === 0) {
-        this.$message({ message: "未勾选信息", type: "warning" });
-        return false;
-      }
-      for (let whgen in this.dialogWhgenlegList) {
-        if (!this.form.fMblno || this.form.fMblno === "") {
-          this.$set(this.form, "fMblno", this.dialogWhgenlegList[whgen].fMblno);
-        }
-        this.dataList.push({
-          fMblno: this.dialogWhgenlegList[whgen].fMblno,
-          fGoodsid: this.dialogWhgenlegList[whgen].fGoodsid,
-          fGoodsids: this.dialogWhgenlegList[whgen].fGoodsids,
-          fMarks: this.dialogWhgenlegList[whgen].fMarks,
-          fOriginalbillno: this.dialogWhgenlegList[whgen].fOriginalbillno,
-          fWarehouselocid: this.dialogWhgenlegList[whgen].fWarehouseLocationid,
-          fWarehouselocids: this.dialogWhgenlegList[whgen]
-            .fWarehouseLocationids,
-          fPlanqty: this.dialogWhgenlegList[whgen].fQtyblc,
-          fPlannetweight: this.dialogWhgenlegList[whgen].fNetweightblc,
-          fPlangrossweight: this.dialogWhgenlegList[whgen].fGrossweightblc,
-          fQty: 0,
-          fCntqty: 1,
-          fNetweight: 0,
-          fGrossweight: 0,
-          fPackagespecs: null,
-          fGoodsval: null,
-          remark: null,
-        });
-      }
-      this.whgenlegVisible = false;
-    },
-    // 收货单打印界面
-    showEditDialog_s() {
-      this.editDialogVisible_s = true;
-    },
-    showEditDialog_ss() {
-      this.editDialogVisible_ss = true;
-    },
-    // 收款信息
-    addCollection() {
-      this.warehouseDrList.push({
-        fCorpid: null,
-        fFeeid: null,
-        fFeeUnitid: null,
-        fQty: 0,
-        fUnitprice: 0,
-        fAmount: 0,
-        fCurrency: null,
-        fCxrate: null,
-        fRate: null,
-        remarks: null,
-      });
-    },
-    addpayment() {
-      this.warehouseCrList.push({
-        fCorpid: null,
-        fFeeid: null,
-        fFeeUnitid: null,
-        fQty: 0,
-        fUnitprice: 0,
-        fAmount: 0,
-        fCurrency: null,
-        fCxrate: null,
-        fRate: null,
-        remarks: null,
-      });
-    },
-    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, "fTrademodeid", "1");
-          // this.$set(this.relevantAttachments, "opUserName", this.userVal.userName);
-          this.$set(this.form, "createTime", Date.parse(new Date()));
-        }
-        if (response.dept !== null) {
-          this.deptOptions = [];
-          this.deptOptions.push(response.dept);
+          fWarehouseid: [{ required: true, message: ' ', trigger: 'blur' }],
+          fbillingway: [
+            {
+              required: true,
+              message: ' ',
+              trigger: 'blur'
+            }
+          ],
+          fTocorpid: [
+            {
+              required: true,
+              message: ' ',
+              trigger: 'blur'
+            }
+          ]
         }
-      });
-    },
-    /** 查询仓库主(出入库)列表 */
-    getList() {
-      this.loading = true;
-      listGoodsTransfer(this.queryParams).then((response) => {
-        this.goodsTransferList = response.rows;
-        console.log(response.rows);
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-     /* 远程模糊查询库区 */
-    kqhouseRemoteMethod(name) {
-      if (name == null || name === "") {
-        return false;
       }
-      if (!this.form.fWarehouseid) {
-        this.$message.error("请输入仓库!");
-        return false;
-      }
-
-      let queryParams = {
-        pageNum: 1,
-        pageSize: 10,
-        fWarehouseid: this.form.fWarehouseid,
-        fName: name,
-      };
-      listArea(queryParams).then((response) => {
-        this.kqhouseOptions = response.rows;
-      });
-    },
-    // 贸易方式(数据字典),对���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);
-    },
-    // 编号字典翻译
-    fStltypeidFormat(row, column) {
-      return this.selectDictLabel(this.fStltypeOptions, row.fStltypeid);
     },
-    // 是否质押(数据字典),默认 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.deptOptions = [];
-      this.fWbuOptions = [];
-      this.fWbuOptions = [];
-      this.fMblnoOptions = [];
-      this.KHblnoOptions = [];
-      this.KHblnoOptions = [];
-      this.warehouseOptions = [];
-       this.relevantAttachments = [];
-      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.dataList = [];
-      this.warehouseCrList = [];
-      this.warehouseDrList = [];
-      this.relevantAttachments = [];
-      this.title = "货权转移";
+    created() {
+      this.getList()
+      this.getDicts('tax_rate').then((response) => {
+        this.fTaxrate = response.data[0].dictValue
+      })
+      this.getDicts('data_trademodes').then((response) => {
+        this.fTrademodeidOptions = 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, status) {
-      this.browseStatus = status;
-      console.log("@@@");
-      this.reset();
-      console.log("@@@+333");
-      const fId = row.fId || this.ids;
-      getGoodsTransfer(fId).then((response) => {
-        this.form = response.data.warehousebills;
-        if (this.form.fStltypeid) {
-          this.$set(this.form, "fStltypeid", this.form.fStltypeid + "");
-        }
-        if (this.form.fChargedate) {
-          this.$set(
-            this.form,
-            "fChargedate",
-            Date.parse(this.form.fChargedate)
-          );
-        }
-        if (this.form.fTrademodeid) {
-          this.$set(this.form, "fTrademodeid", this.form.fTrademodeid + "");
-        }
-        this.fMblnoOptions = response.data.corps;
-        this.KHblnoOptions = response.data.corps;
-        this.fWbuOptions = response.data.feesList;
-        this.warehouseOptions = response.data.warehouse;
-        if (response.data.dept) {
-          this.deptOptions = [];
-          this.deptOptions.push(response.data.dept);
-        }
-        this.dataList = response.data.warehouseBillsItem;
-        for (let list in this.dataList) {
-          this.$set(
-            this.dataList[list],
-            "fBsdate",
-            Date.parse(this.dataList[list].fBsdate)
-          );
+    methods: {
+      // 上传成功返回数据
+      showFile(row) {
+        // this.$set(this.relevantAttachments[0], 'fName', row.fileName)
+        this.$set(this.relevantAttachments[0], 'fUrl', row.url)
+      },
+      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
+        })
+      },
+      // 新增附件上传
+      addRelevt() {
+        this.relevantAttachments.push({
+          fUrl: null,
+          fName: null,
+          createBy: this.form.createBy,
+          createTime: Date.parse(new Date())
+        })
+      },
+      // 添加list
+      addRelevant() {
+        if (
+          !this.form.fCorpid ||
+          !this.form.fTrademodeid ||
+          !this.form.fWarehouseid
+        ) {
+          this.$message({
+            message: '请维护货权方、贸易方式、仓库',
+            type: 'warning'
+          })
+          return false
         }
-        this.goodsOptions = response.data.goodsList;
-        // this.relevantAttachments = response.data.enclosures;
-        this.warehouseDrList = response.data.warehousebillsfeesDr;
-        for (let dr in this.warehouseDrList) {
-          this.$set(
-            this.warehouseDrList[dr],
-            "fFeeUnitid",
-            this.warehouseDrList[dr].fFeeUnitid + ""
-          );
+        this.whgenlegList = []
+        this.dialogWhgenlegList = []
+        this.whgenlegTotal = 0
+        this.whgenlegVisible = true
+        this.getWhgenlegList()
+      },
+      // 查询库存总账信息
+      getWhgenlegList() {
+        this.whgenlegParams.fMblno = this.form.fMblno
+        this.whgenlegParams.fCorpid = this.form.fCorpid
+        this.whgenlegParams.fWarehouseid = this.form.fWarehouseid
+        this.whgenlegParams.fTrademodeid = this.form.fTrademodeid
+        this.whgenlegParams.orgStorageDate = this.orgStorageDate
+        listWhgenleg(this.whgenlegParams).then((response) => {
+          this.whgenlegList = response.rows
+          this.whgenlegTotal = response.total
+        })
+      },
+      // 库存总账多选框
+      whgenlegSelectionChange(selection) {
+        this.dialogWhgenlegList = selection
+      },
+      // 库存总账导出数据
+      whgenlegData() {
+        if (this.dialogWhgenlegList.length === 0) {
+          this.$message({ message: '未勾选信息', type: 'warning' })
+          return false
         }
-        this.warehouseCrList = response.data.warehousebillsfeesCr;
-        for (let cr in this.warehouseCrList) {
-          this.$set(
-            this.warehouseCrList[cr],
-            "fFeeUnitid",
-            this.warehouseCrList[cr].fFeeUnitid + ""
-          );
+        setTimeout(() => {
+          for (let whgen in this.dialogWhgenlegList) {
+            this.dataList.push({
+              fId: null,
+              fMblno: this.dialogWhgenlegList[whgen].fMblno,
+              fGoodsid: this.dialogWhgenlegList[whgen].fGoodsid,
+              fGoodsids: this.dialogWhgenlegList[whgen].fGoodsids,
+              fMarks: this.dialogWhgenlegList[whgen].fMarks,
+              fOriginalbillno: this.dialogWhgenlegList[whgen].fOriginalbillno,
+              fOriginalbilldate: this.dialogWhgenlegList[whgen].fOriginalbilldate,
+              fWarehouselocid: this.dialogWhgenlegList[whgen].fWarehouseLocationid,
+              fWarehouselocids: this.dialogWhgenlegList[whgen].fWarehouseLocationids,
+              fPackagespecs: this.dialogWhgenlegList[whgen].fPackagespecs,
+              fPlanqty: this.dialogWhgenlegList[whgen].fQtyblc,
+              fVolumn: this.dialogWhgenlegList[whgen].fVolumnblc,
+              fPlannetweight: this.dialogWhgenlegList[whgen].fNetweightblc,
+              fPlangrossweight: this.dialogWhgenlegList[whgen].fGrossweightblc,
+              fQty: 0,
+              fCntqty: 1,
+              remark: null,
+              fGoodsval: 0,
+              fNetweight: 0,
+              fBillstatus: 1,
+              fGrossweight: 0
+            })
+          }
+        }, 100);
+        setTimeout(() => {
+          this.updateDeduplication()
+        }, 300);
+        this.whgenlegVisible = false
+      },
+      // 更新主表唛头、品名并去重
+      updateDeduplication: function() {
+        if (this.dataList.length === 0) {
+          return false
         }
-        this.userOptions = response.data.sysUser;
-        this.$set(this.form, "fBsdate", Date.parse(this.form.fBsdate));
-        this.open = true;
-        this.title = "修改仓入库";
-      });
-    },
-    // 库存明细合计
-    getSummaries(param) {
-      const { columns, data } = param;
-      const sums = [];
-      var values = [];
-      columns.forEach((column, index) => {
-        if (index === 0) {
-          sums[index] = "";
-          return;
+        let fMarks = []
+        let fProductName = []
+        for (let li in this.dataList) {
+          fMarks.push(this.dataList[li].fMarks)
+          fProductName.push(this.dataList[li].fProductName)
         }
-        if (column.property === "fPlanqty") {
-          values = data.map((item) => Number(item["fPlanqty"]));
+        this.$set(this.form, 'fMarks', Array.from(new Set(fMarks)).join(","))
+        this.$set(this.form, 'fProductName', Array.from(new Set(fProductName)).join(","))
+      },
+      // 收货单打印界面
+      showEditDialog_s() {
+        this.editDialogVisible_s = true
+      },
+      showEditDialog_ss() {
+        this.editDialogVisible_ss = true
+      },
+      // 收款信息
+      addCollection() {
+        this.warehouseDrList.push({
+          fCorpid: null,
+          fFeeid: null,
+          fFeeunitid: 1,
+          fQty: 0,
+          fUnitprice: 0,
+          fAmount: 0,
+          fCurrency: null,
+          fCxrate: null,
+          fTaxrate: this.fTaxrate,
+          fRate: null,
+          remarks: null
+        })
+      },
+      addpayment() {
+        this.warehouseCrList.push({
+          fCorpid: null,
+          fFeeid: null,
+          fFeeunitid: 1,
+          fQty: 0,
+          fUnitprice: 0,
+          fAmount: 0,
+          fCurrency: null,
+          fTaxrate: this.fTaxrate,
+          fCxrate: null,
+          fRate: null,
+          remarks: null
+        })
+      },
+      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, 'fTrademodeid', '1')
+            // this.$set(this.relevantAttachments, "opUserName", this.userVal.userName);
+            this.$set(this.form, 'createTime', Date.parse(new Date()))
+          }
+        })
+      },
+      /** 查询仓库主(出入库)列表 */
+      getList() {
+        this.loading = true
+        listGoodsTransfer(this.queryParams).then((response) => {
+          this.goodsTransferList = response.rows
+          this.total = response.total
+          this.loading = false
+        })
+      },
+      /* 远程模糊查询库区 */
+      kqhouseRemoteMethod(name) {
+        if (name == null || name === '') {
+          return false
         }
-        if (column.property === "fNetweight") {
-          values = data.map((item) => Number(item["fPlannetweight"]));
+        if (!this.form.fWarehouseid) {
+          this.$message.error('请输入仓库!')
+          return false
         }
-        if (column.property === "fPlannetweight") {
-          values = data.map((item) => Number(item["fPlannetweight"]));
+
+        let queryParams = {
+          pageNum: 1,
+          pageSize: 10,
+          fWarehouseid: this.form.fWarehouseid,
+          fName: name
         }
-        if (column.property === "fQty") {
-          values = data.map((item) => Number(item["fQty"]));
+        listArea(queryParams).then((response) => {
+          this.kqhouseOptions = response.rows
+        })
+      },
+      // 贸易方式(数据字典),对���t_trademodels 字典翻译
+      fTrademodeidFormat(row, column) {
+        return this.selectDictLabel(this.fTrademodeidOptions, row.fTrademodeid)
+      },
+      // 是否过磅(数据字典)默认 F ,过磅T 否者F 下拉选择字典翻译
+      fIfweighFormat(row, column) {
+        return this.selectDictLabel(this.fIfweighOptions, row.fIfweigh)
+      },
+      // 编号字典翻译
+      fStltypeidFormat(row, column) {
+        return this.selectDictLabel(this.fStltypeOptions, row.fStltypeid)
+      },
+      // 是否质押(数据字典),默认 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.reset()
+        this.open = false
+      },
+      // 表单重置
+      reset() {
+        this.dataList = []
+        this.fWbuOptions = []
+        this.fWbuOptions = []
+        this.resetForm('form')
+        this.fMblnoOptions = []
+        this.KHblnoOptions = []
+        this.KHblnoOptions = []
+        this.warehouseDrList = []
+        this.warehouseCrList = []
+        this.warehouseOptions = []
+        this.relevantAttachments = []
+      },
+      /** 搜索按钮操作 */
+      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.dataList = []
+        this.warehouseCrList = []
+        this.warehouseDrList = []
+        this.relevantAttachments = []
+        this.title = '货权转移'
+      },
+      /** 修改按钮操作 */
+      handleUpdate(row, status) {
+        this.browseStatus = status
+        this.reset()
+        const fId = row.fId || this.ids
+        getGoodsTransfer(fId).then((response) => {
+          this.form = response.data.warehousebills
+          if (this.form.fStltypeid) {
+            this.$set(this.form, 'fStltypeid', this.form.fStltypeid + '')
+          }
+          if (this.form.fChargedate) {
+            this.$set(this.form, 'fChargedate', Date.parse(this.form.fChargedate))
+          }
+          if (this.form.fTrademodeid) {
+            this.$set(this.form, 'fTrademodeid', this.form.fTrademodeid + '')
+          }
+          this.fMblnoOptions = response.data.corps
+          this.KHblnoOptions = response.data.corps
+          this.fWbuOptions = response.data.feesList
+          this.warehouseOptions = response.data.warehouse
+          this.dataList = response.data.warehouseBillsItem
+          for (let list in this.dataList) {
+            if (this.dataList[list].fBillstatus && this.dataList[list].fBillstatus === 6) {
+              this.formBrowseStatus = true
+            }
+            this.$set(this.dataList[list], 'fBsdate', Date.parse(this.dataList[list].fBsdate))
+          }
+          this.goodsOptions = response.data.goodsList
+          if (response.data.warehousebillsfeesDr) {
+            this.warehouseDrList = response.data.warehousebillsfeesDr
+          }
+          if (response.data.warehousebillsfeesCr) {
+            this.warehouseCrList = response.data.warehousebillsfeesCr
+          }
+          if (response.data.enclosures) {
+            this.relevantAttachments = response.data.enclosures;
+          }
+          this.userOptions = response.data.sysUser
+          this.$set(this.form, 'fBsdate', Date.parse(this.form.fBsdate))
+          this.open = true
+          this.title = '修改仓入库'
+        })
+      },
+      // 库存明细合计
+      getSummaries(param) {
+        const { columns, data } = param
+        const sums = []
+        var values = []
+        columns.forEach((column, index) => {
+          if (index === 0) {
+            sums[index] = ''
+            return
+          }
+          if (column.property === 'fPlanqty') {
+            values = data.map((item) => Number(item['fPlanqty']))
+          }
+          if (column.property === 'fNetweight') {
+            values = data.map((item) => Number(item['fPlannetweight']))
+          }
+          if (column.property === 'fPlannetweight') {
+            values = data.map((item) => Number(item['fPlannetweight']))
+          }
+          if (column.property === 'fQty') {
+            values = data.map((item) => Number(item['fQty']))
+          }
+          if (column.property === 'fGrossweight') {
+            values = data.map((item) => Number(item['fGrossweight']))
+          }
+          if (column.property === 'fCntqty') {
+            values = data.map((item) => Number(item['fCntqty']))
+          } // const values = data.map(item => Number(item[column.property]))
+          if (
+            column.property === 'fPlanqty' ||
+            column.property === 'fPlannetweight' ||
+            column.property === 'fQty' ||
+            column.property === 'fGrossweight' ||
+            column.property === 'fCntqty' ||
+            column.property === 'fPlannetweight'
+          ) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr)
+              if (!isNaN(value)) {
+                if (column.property === 'fGrossweight') {
+                  this.form.fGrossweight = prev + curr
+                }
+                if (column.property === 'fQty') {
+                  this.form.fQty = prev + curr
+                }
+                if (column.property === 'fCntqty') {
+                  this.form.fCntqty = prev + curr
+                }
+                if (column.property === 'fPlannetweight') {
+                  this.form.fNetweight = prev + curr
+                }
+                return prev + curr
+              } else {
+                return prev
+              }
+            }, 0) // sums[index]
+          }
+        })
+        this.sums = sums
+        return sums
+      },
+      // 入账
+      creditClick() {
+        if (this.dataList.length === 0) {
+          this.$message({ message: '未找到货转明细', type: 'warning' })
+          return false
         }
-        if (column.property === "fGrossweight") {
-          values = data.map((item) => Number(item["fGrossweight"]));
+        for (let dataSelection in this.dataListSelection) {
+          if (!this.dataListSelection[dataSelection].fId) {
+            this.$message({ message: '请先点击保存，在进行货转确认', type: 'warning' })
+            return false
+          }
         }
-        if (column.property === "fCntqty") {
-          values = data.map((item) => Number(item["fCntqty"]));
-        } // const values = data.map(item => Number(item[column.property]))
-        if (
-          column.property === "fPlanqty" ||
-          column.property === "fPlannetweight" ||
-          column.property === "fQty" ||
-          column.property === "fGrossweight" ||
-          column.property === "fCntqty" ||
-          column.property === "fPlannetweight"
-        ) {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr);
-            if (!isNaN(value)) {
-              if (column.property === "fGrossweight") {
-                this.form.fGrossweight = prev + curr;
+        this.$refs['form'].validate((valid) => {
+          if (valid) {
+            for (let li in this.dataList) {
+              if (!this.dataList[li].fWarehouselocids) {
+                this.$message({ message: '请维护第' + Number(li) + 1 + '行库区', type: 'warning' })
+                return false
+              }
+              if (!this.dataList[li].fQty) {
+                this.$message({ message: '请维护第' + Number(li) + 1 + '行货转件数', type: 'warning' })
+                return false
               }
-              if (column.property === "fQty") {
-                this.form.fQty = prev + curr;
+              if (!this.dataList[li].fGrossweight) {
+                this.$message({ message: '请维护第' + Number(li) + 1 + '行货转毛重', type: 'warning' })
+                return false
               }
-              if (column.property === "fCntqty") {
-                this.form.fCntqty = prev + curr;
+              if (!this.dataList[li].fNetweight) {
+                this.$message({ message: '请维护第' + Number(li) + 1 + '行货转净重', type: 'warning' })
+                return false
               }
-              if (column.property === "fPlannetweight") {
-                this.form.fNetweight = prev + curr;
+              if (!this.dataList[li].fPackagespecs) {
+                this.$message({ message: '请维护第' + Number(li) + 1 + '行货包装规格', type: 'warning' })
+                return false
               }
-              return prev + curr;
-            } else {
-              return prev;
             }
-          }, 0); // sums[index]
-        }
-      });
-      this.sums = sums;
-      return sums;
-    },
-    // 入账
-    creditClick() {
-      this.$refs["form"].validate((valid) => {
-        if (valid) {
-          let formData = new window.FormData();
-          formData.append("warehouseBills", JSON.stringify(this.form));
-          formData.append(
-            "warehousebillsitems",
-            JSON.stringify(this.dataListSelection)
-          );
-          formData.append("whgenleg", JSON.stringify(this.relevantAttachments));
-          addWhgenleg(formData).then((response) => {
-            this.msgSuccess("入账成功");
-            for (let li in this.dataListSelection) {
-              for (let i in this.dataList) {
-                let fQty =
-                  this.dataList[i].fQty === this.dataListSelection[li].fQty;
-                let fBsdate =
-                  this.dataList[i].fBsdate ===
-                  this.dataListSelection[li].fBsdate;
-                let fGoodsid =
-                  this.dataList[i].fGoodsid ===
-                  this.dataListSelection[li].fGoodsid;
-                let fcntrtype =
-                  this.dataList[i].fcntrtype ===
-                  this.dataListSelection[li].fcntrtype;
-                let fNetweight =
-                  this.dataList[i].fNetweight ===
-                  this.dataListSelection[li].fNetweight;
-                let fGrossweight =
-                  this.dataList[i].fGrossweight ===
-                  this.dataListSelection[li].fGrossweight;
-                if (
-                  fBsdate &&
-                  fGoodsid &&
-                  fcntrtype &&
-                  fGrossweight &&
-                  fNetweight &&
-                  fQty
-                ) {
-                  this.$set(this.dataList[i], "fBillstatus", "6");
+            let formData = new window.FormData()
+            formData.append('warehouseBills', JSON.stringify(this.form))
+            formData.append('warehousebillsitems', JSON.stringify(this.dataListSelection))
+            addWhgenleg(formData).then((response) => {
+              this.$refs.tableListRef.clearSelection()
+              this.msgSuccess('入账成功')
+              let item = response.data.warehouseItem
+              for (let li in this.dataList) {
+                for (let ite in item) {
+                  if (this.dataList[li].fId === item[ite].fId) {
+                    this.$set(this.dataList[li], 'fBillstatus', 6)
+                  }
                 }
               }
-            }
-            this.$refs.tableList.clearSelection();
-          });
-        }
-      });
-    },
-     // 撤回入账
-    withdrawClick() {
-      console.log("@@@");
-      // 撤回入库
-      let formData = new window.FormData();
-      formData.append("warehouseBills", JSON.stringify(this.form));
-      console.log(this.form);
-      formData.append(
-        "warehousebillsitems",
-        JSON.stringify(this.dataWithdrawList)
-      );
-      console.log(this.dataWithdrawList);
-      updateCredit(formData).then((response) => {
-        this.fid = response.data;
-        this.formBrowseStatus = false;
-        this.msgSuccess("撤销入账成功");
-        this.$refs.tableList.clearSelection();
-        for (let li in this.dataWithdrawList) {
+              this.formBrowseStatus = true
+            })
+          }
+        })
+      },
+      // 撤回入账
+      withdrawClick() {
+        // 撤回入库
+        let formData = new window.FormData()
+        let withdrawList = JSON.parse(JSON.stringify(this.dataWithdrawList))
+        formData.append('warehousebillsitems', JSON.stringify(withdrawList))
+        formData.append('warehouseBills', JSON.stringify(this.form))
+        updateCredit(formData).then((response) => {
+          this.fid = response.data
+          this.formBrowseStatus = false
+          this.msgSuccess('撤销入账成功')
+          this.$refs.tableListRef.clearSelection()
+          let mun = 0;
           for (let i in this.dataList) {
-            let fQty = this.dataList[i].fQty === this.dataWithdrawList[li].fQty;
-            let fBsdate =
-              this.dataList[i].fBsdate === this.dataWithdrawList[li].fBsdate;
-            let fGoodsid =
-              this.dataList[i].fGoodsid === this.dataWithdrawList[li].fGoodsid;
-            let fcntrtype =
-              this.dataList[i].fcntrtype ===
-              this.dataWithdrawList[li].fcntrtype;
-            let fNetweight =
-              this.dataList[i].fNetweight ===
-              this.dataWithdrawList[li].fNetweight;
-            let fGrossweight =
-              this.dataList[i].fGrossweight ===
-              this.dataWithdrawList[li].fGrossweight;
-            if (
-              fBsdate &&
-              fGoodsid &&
-              fcntrtype &&
-              fGrossweight &&
-              fNetweight &&
-              fQty
-            ) {
-              this.$set(this.dataList[i], "fBillstatus", "1");
+            for (let li in withdrawList) {
+              if (withdrawList[li].fId === this.dataList[i].fId) {
+                this.$set(this.dataList[i], 'fBillstatus', 1)
+              }
             }
+            if (this.dataList[i].fBillstatus && this.dataList[i].fBillstatus === 6) {
+              mun ++;
+            }
+          }
+          if (mun > 0) {
+            this.formBrowseStatus = true
+          } else {
+            this.formBrowseStatus = false
+          }
+        })
+      },
+      // 付款合计
+      warehouseDrSummaries(param) {
+        const { columns, data } = param
+        const sums = []
+        columns.forEach((column, index) => {
+          if (index === 0) {
+            sums[index] = '合计'
+            return
           }
+          const values = data.map((item) => Number(item[column.property]))
+          if (
+            column.property === 'fUnitprice' ||
+            column.property === 'fAmount' ||
+            column.property === 'fQty' ||
+            column.property === 'fQty'
+          ) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr)
+              if (!isNaN(value)) {
+                return prev + curr
+              } else {
+                return prev
+              }
+            }, 0) // sums[index]
+          }
+        })
+        return sums
+      },
+      // 数量计算
+      changeContractAmt(row) {
+        let fQty = 0
+        let fUnitprice = 0
+        if (row.fUnitprice) {
+          fUnitprice = row.fUnitprice
         }
-      });
-    },
-    // 付款合计
-    warehouseDrSummaries(param) {
-      const { columns, data } = param;
-      const sums = [];
-      columns.forEach((column, index) => {
-        if (index === 0) {
-          sums[index] = "合计";
-          return;
+        if (row.fQty) {
+          fQty = row.fQty
         }
-        const values = data.map((item) => Number(item[column.property]));
-        if (
-          column.property === "fUnitprice" ||
-          column.property === "fAmount" ||
-          column.property === "fQty" ||
-          column.property === "fQty"
-        ) {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr);
-            if (!isNaN(value)) {
-              return prev + curr;
-            } else {
-              return prev;
-            }
-          }, 0); // sums[index]
+        this.$set(row, 'fAmount', Number(fUnitprice) * Number(fQty)).toFixed(2)
+      },
+      changefBsdate(row) {
+        if (this.dataList.length > 0) {
+          for (var i = 0; i < this.dataList.length; i++) {
+            this.$set(this.dataList[i], 'fBsdate', row)
+          }
         }
-      });
-      return sums;
-    },
-    // 数量计算
-    changeContractAmt(row) {
-      let fQty = 0;
-      let fUnitprice = 0;
-      if (row.fUnitprice) {
-        fUnitprice = row.fUnitprice;
-      }
-      if (row.fQty) {
-        fQty = row.fQty;
-      }
-      this.$set(row, "fAmount", Number(fUnitprice) * Number(fQty)).toFixed(2);
-    },
-    changefBsdate(row) {
-      if (this.dataList.length > 0) {
-        for (var i = 0; i < this.dataList.length; i++) {
-          this.$set(this.dataList[i], "fBsdate", row);
+      },
+      // 库存明细多选
+      Selectinventory(selection) {
+        this.dataWithdrawList = []
+        this.dataListSelection = []
+        if (!selection || selection.length === 0) {
+          return false
         }
-      }
-    },
-    // 库存明细多选
-    Selectinventory(selection) {
-      console.log(selection);
-      this.Printinglist = selection;
-      this.dataListSelection = selection;
-      if (!selection || selection.length === 0) {
-        return false;
-      } else {
         for (let se in selection) {
-          if (!selection[se].fBillstatus || selection[se].fBillstatus !== "6") {
-            this.dataListSelection.push(selection[se]);
-          } else if (
-            selection[se].fBillstatus &&
-            selection[se].fBillstatus === "6"
-          ) {
-            this.dataWithdrawList.push(selection[se]);
+          if (!selection[se].fBillstatus || selection[se].fBillstatus !== 6) {
+            this.dataListSelection.push(selection[se])
+          } else if (selection[se].fBillstatus && selection[se].fBillstatus === 6) {
+            this.dataWithdrawList.push(selection[se])
           }
         }
-      if (this.Printinglist.length > 0) {
-        this.fTruckno = selection[0].fTruckno;
-        this.fBsdate = new Date(selection[0].fBsdate);
-        this.fCntrtype = selection[0].fCntrtype;
-        this.fGoodsids = selection[0].fGoodsids;
-      }
-      }
-    },
-    // 库存明细多选框结果
-    dataListChange(row) {
-      console.log(JSON.stringify(row));
-      this.dataListSelection = row;
-    },
-    /** 提交按钮 */
-    submitForm(status) {
-      console.log(this.dataList);
-      this.$refs["form"].validate((valid) => {
-        if (this.form.fCorpid === this.form.fTocorpid) {
-          this.$message.error("新货权方不得与货权方一致");
-          return false;
-        }
-       
-        if (this.dataList.length === 0) {
-          this.$message.error("请添加库存明细!");
-          return false;
-        }
-        // alert("5555")
-        // if (this.relevantAttachments.length === 0) {
-        //   this.$message.error("请添加附件上传!");
-        //   return false;
-        // }
-        
-        if (this.warehouseDrList.length === 0) {
-          this.$message.error("请添加收款信息!");
-          return false;
+      },
+      // 库存明细多选框结果
+      dataListChange(row) {
+        this.dataListSelection = row
+      },
+      saveForm() {
+        this.$refs['form'].validate((valid) => {
+          if (this.form.fCorpid === this.form.fTocorpid) {
+            this.$message.error('新货权方不得与货权方一致')
+            return false
+          }
+          if (this.dataList.length === 0) {
+            this.$message.error('请添加库存明细!')
+            return false
+          }
+          for (let list in this.dataList) {
+            if (!this.dataList[list].fQty || Number(this.dataList[list].fQty) === 0) {
+              this.$message.error('请维护序号为' + (Number(list) + 1) + '的货转件数!')
+              return false
+            }
+            if (!this.dataList[list].fGrossweight || Number(this.dataList[list].fGrossweight) === 0) {
+              this.$message.error('请维护序号为' + (Number(list) + 1) + '的货转毛重!')
+              return false
+            }
+          }
+          if (valid) {
+            this.form.fBillstatus = 2
+            let formData = new window.FormData()
+            // 附件数据
+            formData.append('tWarehouseBills', JSON.stringify(this.form))
+            // 库存明细
+            formData.append('tWarehousebillsitems', JSON.stringify(this.dataList))
+            // 附件数据
+            formData.append('tEnclosure', JSON.stringify(this.relevantAttachments))
+            // 费用明细付款
+            formData.append('tWarehousebillsfeesCr', JSON.stringify(this.warehouseCrList))
+            // 收款
+            formData.append('tWarehousebillsfeesDr', JSON.stringify(this.warehouseDrList))
+            addGoodsTransfer(formData).then((response) => {
+              this.msgSuccess('保存成功')
+              this.form = response.data.warehouseBills
+              this.$set(this.form, 'fBsdate', Date.parse(this.form.fBsdate))
+              this.$set(this.form, 'fTrademodeid', this.form.fTrademodeid + '')
+              this.$set(this.form, 'fChargedate', Date.parse(this.form.fChargedate))
+              this.dataList = response.data.warehousebillsitems
+            })
+          }
+        })
+      },
+      /** 提交按钮 */
+      submitForm() {
+        this.$refs['form'].validate((valid) => {
+          if (this.form.fCorpid === this.form.fTocorpid) {
+            this.$message.error('新货权方不得与货权方一致')
+            return false
+          }
+          if (this.dataList.length === 0) {
+            this.$message.error('请添加库存明细!')
+            return false
+          }
+          for (let list in this.dataList) {
+            if (!this.dataList[list].fQty || Number(this.dataList[list].fQty) === 0) {
+              this.$message.error('请维护序号为' + (Number(list) + 1) + '的货转件数!')
+              return false
+            }
+            if (!this.dataList[list].fGrossweight || Number(this.dataList[list].fGrossweight) === 0) {
+              this.$message.error('请维护序号为' + (Number(list) + 1) + '的货转毛重!')
+              return false
+            }
+          }
+          if (this.relevantAttachments.length !== 0) {
+            for (let relevant in this.relevantAttachments) {
+              if (!this.relevantAttachments[relevant].fName) {
+                this.$message.error('请输入附件名称!')
+                return false
+              }
+            }
+          }
+          if (this.warehouseDrList.length !== 0) {
+            for (let warehouseDr in this.warehouseDrList) {
+              if (!this.warehouseDrList[warehouseDr].fAmount) {
+                this.$message.error('收款信息序号为' + (Number(warehouseDr) + 1) + '的金额异常')
+                return false
+              }
+            }
+          }
+          if (this.warehouseDrList.length !== 0) {
+            for (let warehouseCr in this.warehouseCrList) {
+              if (!this.warehouseCrList[warehouseCr].fAmount) {
+                this.$message.error(
+                  '付款信息序号为' + (Number(warehouseCr) + 1) + '的金额异常'
+                )
+                return false
+              }
+            }
+          }
+          if (valid) {
+            this.form.fBillstatus = 4
+            let formData = new window.FormData()
+            // 附件数据
+            formData.append('tWarehouseBills', JSON.stringify(this.form))
+            // 库存明细
+            formData.append('tWarehousebillsitems', JSON.stringify(this.dataList))
+            // 附件数据
+            formData.append('tEnclosure', JSON.stringify(this.relevantAttachments))
+            // 费用明细付款
+            formData.append('tWarehousebillsfeesCr', JSON.stringify(this.warehouseCrList))
+            // 收款
+            formData.append('tWarehousebillsfeesDr', JSON.stringify(this.warehouseDrList))
+            warehouseSubmission(formData).then((response) => {
+              this.msgSuccess('提交成功')
+              this.cancel()
+              this.getList()
+            })
+          }
+        })
+      },
+      /** 删除按钮操作 */
+      handleDelete(row) {
+        const fIds = row.fId || this.ids
+        this.$confirm(
+          '是否确认删除仓库主(出入库)编号为"' + fIds + '"的数据项?',
+          '警告',
+          {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }
+        )
+          .then(function() {
+            return delGoodsTransfer(fIds)
+          })
+          .then(() => {
+            this.getList()
+            this.msgSuccess('删除成功')
+          })
+      },
+      /** 导出按钮操作 */
+      handleExport() {
+        const queryParams = this.queryParams
+        this.$confirm('是否确认导出所有仓库主(出入库)数据项?', '警告', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
+          .then(function() {
+            return exportgoodsTransfer(queryParams)
+          })
+          .then((response) => {
+            this.download(response.msg)
+          })
+      },
+      // 货转件数的计算
+      qtyChange(row) {
+        if (!row.fQty || row.fQty === '') {
+          this.$set(row, 'fNetweight', 0)
+          this.$set(row, 'fGrossweight', 0)
+          return false
         }
-        if (this.warehouseCrList.length === 0) {
-          this.$message.error("请添加付款信息!");
-          return false;
+        // 净重 fPlannetweight
+        // 毛重 fPlangrossweight
+        let netweight = parseFloat(Number(row.fPlannetweight) / Number(row.fPlanqty)).toFixed(6)
+        let grossweigh = parseFloat(Number(row.fPlangrossweight) / Number(row.fPlanqty)).toFixed(6)
+        this.$set(row, 'fNetweight', parseFloat(Number(netweight) * Number(row.fQty)).toFixed(6))
+        this.$set(row, 'fGrossweight', parseFloat(Number(grossweigh) * Number(row.fQty)).toFixed(6))
+      },
+      deleteRow(index, rows) {
+        rows.splice(index, 1)
+        this.this.updateDeduplication()
+      },
+      // 变更计价单位
+      changeFeeUnit(row) {
+        if (!row.fFeeunitid) {
+          return false
         }
-        
-        for (let list in this.dataList) {
-          if (
-            !this.dataList[list].fQty ||
-            Number(this.dataList[list].fQty) === 0
-          ) {
-            this.$message.error(
-              "请维护序号为" + (Number(list) + 1) + "的货转件数!"
-            );
-            return false;
+        let fQty = 0;
+        let fGrossweight = 0;
+        let fNetweight = 0;
+        let volumn = 0;
+        let fixed = 1;
+        for (let li in this.dataList) {
+          if (this.dataList[li].fQty) {
+            fQty = parseFloat(Number(fQty) + Number(this.dataList[li].fQty)).toFixed(2)
           }
-          if (
-            !this.dataList[list].fGrossweight ||
-            Number(this.dataList[list].fGrossweight) === 0
-          ) {
-            this.$message.error(
-              "请维护序号为" + (Number(list) + 1) + "的货转毛重!"
-            );
-            return false;
+          if (this.dataList[li].fGrossweight) {
+            fGrossweight = parseFloat(Number(fGrossweight) + Number(this.dataList[li].fGrossweight)).toFixed(2)
           }
-        }
-         
-        // for (let relevant in this.relevantAttachments) {
-        //   if (!this.relevantAttachments[relevant].fName) {
-        //     this.$message.error("请输入附件名称!");
-        //     return false;
-        //   }
-        // }
-        for (let warehouseDr in this.warehouseDrList) {
-          if (!this.warehouseDrList[warehouseDr].fAmount) {
-            this.$message.error(
-              "收款信息序号为" + (Number(warehouseDr) + 1) + "的金额异常"
-            );
-            return false;
+          if (this.dataList[li].fNetweight) {
+            fNetweight = parseFloat(Number(fNetweight) + Number(this.dataList[li].fNetweight)).toFixed(2)
           }
-        }
-        for (let warehouseCr in this.warehouseCrList) {
-          if (!this.warehouseCrList[warehouseCr].fAmount) {
-            this.$message.error(
-              "付款信息序号为" + (Number(warehouseCr) + 1) + "的金额异常"
-            );
-            return false;
+          if (this.dataList[li].volumn) {
+            volumn = parseFloat(Number(volumn) + Number(this.dataList[li].volumn)).toFixed(2)
           }
         }
-        if (valid) {
-          this.form.fBillstatus = status;
-          let formData = new window.FormData();
-          // 附件数据
-          formData.append("tWarehouseBills", JSON.stringify(this.form));
-          // 库存明细
-          formData.append(
-            "tWarehousebillsitems",
-            JSON.stringify(this.dataList)
-          );
-          // 附件数据
-          formData.append(
-            "tWhgenleg",
-            JSON.stringify(this.relevantAttachments)
-          );
-          // 费用明细付款
-          formData.append(
-            "tWarehousebillsfeesCr",
-            JSON.stringify(this.warehouseCrList)
-          );
-          // 收款
-          formData.append(
-            "tWarehousebillsfeesDr",
-            JSON.stringify(this.warehouseDrList)
-          );
-          addGoodsTransfer(formData).then((response) => {
-            this.msgSuccess("提交成功");
-            this.open = false;
-            this.getList();
-          });
+        if (row.fFeeunitid === 1) {
+          this.$set(row, 'fQty', fQty)
+        } else if (row.fFeeunitid === 2) {
+          this.$set(row, 'fQty', fGrossweight)
+        }else if (row.fFeeunitid === 3) {
+          this.$set(row, 'fQty', fNetweight)
+        }else if (row.fFeeunitid === 4) {
+          this.$set(row, 'fQty', volumn)
+        }else if (row.fFeeunitid === 5) {
+          this.$set(row, 'fQty', fixed)
         }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const fIds = row.fId || this.ids;
-      this.$confirm(
-        '是否确认删除仓库主(出入库)编号为"' + fIds + '"的数据项?',
-        "警告",
-        {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
+
+        console.log(fQty+',,,' + fGrossweight+',,,' + fNetweight+',,,' + volumn+',,,' + fixed)
+        if (row.fUnitprice) {
+          this.$set(row, 'fAmount', parseFloat(Number(row.fUnitprice) * Number(row.fQty)).toFixed(2))
+        }
+      },
+      /* 远程模糊查询用户 */
+      corpsRemoteMethod(name) {
+        if (name == null || name === '') {
+          return false
         }
-      )
-        .then(function () {
-          return delgoodsTransfer(fIds);
+        let queryParams = { pageNum: 1, pageSize: 10, fName: name }
+        listCorps(queryParams).then((response) => {
+          this.fMblnoOptions = response.rows
+          this.KHblnoOptions = response.rows
         })
-        .then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        });
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm("是否确认导出所有仓库主(出入库)数据项?", "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(function () {
-          return exportgoodsTransfer(queryParams);
+      },
+      /* 远程模糊查询商品 */
+      goodsRemoteMethod(name) {
+        if (name == null || name === '') {
+          return false
+        }
+        let queryParams = { pageNum: 1, pageSize: 10, fName: name }
+        listGoods(queryParams).then((response) => {
+          this.goodsOptions = response.rows
+        })
+      },
+      // 远程模糊查询费用名称
+      fWRemoteMethod(name) {
+        if (name == null || name === '') {
+          return false
+        }
+        let queryParams = { pageNum: 1, pageSize: 10, fName: name }
+        listFees(queryParams).then((response) => {
+          this.fWbuOptions = 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
         })
-        .then((response) => {
-          this.download(response.msg);
-        });
-    },
-    // 货转件数的计算
-    qtyChange(row) {
-      if (!row.fQty || row.fQty === "") {
-        this.$set(row, "fNetweight", 0);
-        this.$set(row, "fGrossweight", 0);
-        return false;
-      }
-      // 净重 fPlannetweight
-      // 毛重 fPlangrossweight
-      let netweight = parseFloat(
-        Number(row.fPlannetweight) / Number(row.fPlanqty)
-      ).toFixed(6);
-      let grossweigh = parseFloat(
-        Number(row.fPlangrossweight) / Number(row.fPlanqty)
-      ).toFixed(6);
-      this.$set(
-        row,
-        "fNetweight",
-        parseFloat(Number(netweight) * Number(row.fQty)).toFixed(6)
-      );
-      this.$set(
-        row,
-        "fGrossweight",
-        parseFloat(Number(grossweigh) * Number(row.fQty)).toFixed(6)
-      );
-    },
-    deleteRow(index, rows) {
-      rows.splice(index, 1);
-    },
-    // 变更计价单位
-    changeFeeUnit(row) {
-      console.log(row);
-      console.log(this.form.fCntqty);
-      if (!row.fFeeUnitid) {
-        return false;
-      }
-      if (row.fFeeUnitid === "0") {
-        console.log(this.form.fCntqty);
-        this.$set(row, "fQty", this.form.fCntqty);
-      } else if (row.fFeeUnitid === "1") {
-        this.$set(row, "fQty", this.form.fGrossweight);
-      }
-      if (row.fUnitprice) {
-        this.$set(
-          row,
-          "fAmount",
-          parseFloat(Number(row.fUnitprice) * Number(row.fQty)).toFixed(2)
-        );
-      }
-    },
-    /* 远程模糊查询用户 */
-    corpsRemoteMethod(name) {
-      if (name == null || name === "") {
-        return false;
-      }
-      let queryParams = { pageNum: 1, pageSize: 10, fName: name };
-      listCorps(queryParams).then((response) => {
-        this.fMblnoOptions = response.rows;
-        this.KHblnoOptions = 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;
-      });
-    },
-    // 远程模糊查询费用名称
-    fWRemoteMethod(name) {
-      if (name == null || name === "") {
-        return false;
-      }
-      let queryParams = { pageNum: 1, pageSize: 10, fName: name };
-      listFees(queryParams).then((response) => {
-        this.fWbuOptions = 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;
-}
+  .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;
+  }
+
+  .el-form-item {
+    margin-bottom: 5px !important;
+  }
 
-.upload-demo {
-  margin-left: 50px;
-}
-.el-form-item {
-  margin-bottom: 5px !important;
-}
-.el-form-item__label {
-  font-size: 12px !important;
-}
+  .el-form-item__label {
+    font-size: 12px !important;
+  }
 </style>