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

src/api/system/dept.js

@@ -33,6 +33,14 @@ export function treeselect() {
   })
 }
 
+// 查询部门下拉树结构
+export function belongSelect() {
+  return request({
+    url: '/system/dept/treeSelect',
+    method: 'get'
+  })
+}
+
 // 根据角色ID查询部门树结构
 export function roleDeptTreeselect(roleId) {
   return request({
@@ -65,4 +73,4 @@ export function delDept(deptId) {
     url: '/system/dept/' + deptId,
     method: 'delete'
   })
-}
+}

src/views/Warehousing/cargoClearance/AddOrUpdate.vue

@@ -4751,7 +4751,7 @@ export default {
             return false;
           } else {
             this.warehouseDrList.push({
-              fCorpid: null,
+              fCorpid: this.form.fCorpid,
               fFeeid: null,
               fFeeUnitid: "",
               fQty: null,
@@ -4787,7 +4787,7 @@ export default {
             return this.$message.error("请维护作业类型");
           } else {
             this.warehouseCrList.push({
-              fCorpid: null,
+              fCorpid: this.form.fCorpid,
               fFeeid: null,
               fFeeUnitid: "",
               fQty: null,
@@ -4958,6 +4958,8 @@ export default {
         this.$set(row, "fQty", (this.fNetweight / 1000).toFixed(2));
       } else if (row.fFeeUnitid === "7") {
         this.$set(row, "fQty", this.fCntqty);
+      } else if (row.fFeeUnitid === "8") {
+        this.$set(row, "fQty", 1);
       } else {
         this.$set(row, "fQty", 0);
       }
@@ -5144,6 +5146,7 @@ export default {
       feesCheck(row.fId).then(res => {
         this.$message.success('请核成功')
         res.data.fFeeUnitid = res.data.fFeeunitid.toString();
+        res.data.fStltypeid = res.data.fStltypeid.toString();
         if (res.data.fDc == 'D') {
           let index = this.warehouseDrList.findIndex(item => item.fId == res.data.fId)
           this.warehouseDrList.splice(index, 1, res.data)
@@ -5157,6 +5160,7 @@ export default {
     revokeListCheck(row) {
       revokefeeCheck(row.fId).then(res => {
         res.data.fFeeUnitid = res.data.fFeeunitid.toString();
+        res.data.fStltypeid = res.data.fStltypeid.toString();
         this.$message.success('操作成功')
         if (res.data.fDc == 'D') {
           let index = this.warehouseDrList.findIndex(item => item.fId == res.data.fId)

src/views/Warehousing/costModify/AddOrUpdate.vue

@@ -565,11 +565,11 @@
               </template>
             </el-table-column>
             <el-table-column prop="createBy" label="录入人" align="center"></el-table-column>
-            <el-table-column prop="createTime" label="录入日期" align="center"></el-table-column>
-            <el-table-column prop="remarks" label="备注" align="center" width="180">
+            <el-table-column prop="createTime" label="录入日期" align="center" show-overflow-tooltip></el-table-column>
+            <el-table-column prop="remark" label="备注" align="center" width="180">
               <template slot-scope="scope">
                 <el-input
-                  v-model="scope.row.remarks"
+                  v-model="scope.row.remark"
                   :disabled="disabledtwo"
                   placeholder="请输入内容"
                 ></el-input>
@@ -904,9 +904,9 @@ export default {
         fQty: null,
         fUnitprice: null,
         fCurrency: null,
-        fExrate: null,
+        fExrate: 1,
         fAmount: null,
-        fTaxrate: null,
+        fTaxrate: 0,
         fSrcTypeId: 10,
         fBillstatus: null,
         actId: 1000,
@@ -920,6 +920,8 @@ export default {
       let list = JSON.parse(JSON.stringify(row))
       list.fId = ''
       list.fBillstatus = ''
+      list.createBy = null
+      list.createTime = null
       list.actId = 1100
       list.fSrcTypeId = 10
       this.formfeesList.push(list)

src/views/Warehousing/goodsTransfer/AddOrUpdate.vue

@@ -4183,7 +4183,7 @@ export default {
             return false;
           } else {
             this.warehouseDrList.push({
-              fCorpid: null,
+              fCorpid: this.form.fCorpid,
               fFeeid: null,
               fFeeUnitid: "",
               fQty: null,
@@ -4219,7 +4219,7 @@ export default {
             return this.$message.error("请维护作业类型");
           } else {
             this.warehouseCrList.push({
-              fCorpid: null,
+              fCorpid: this.form.fCorpid,
               fFeeid: null,
               fFeeUnitid: "",
               fQty: null,
@@ -4391,6 +4391,8 @@ export default {
         this.$set(row, "fQty", (this.fNetweight / 1000).toFixed(2));
       } else if (row.fFeeUnitid === "7") {
         this.$set(row, "fQty", this.fCntqty);
+      } else if (row.fFeeUnitid === "8") {
+        this.$set(row, "fQty", 1);
       } else {
         this.$set(row, "fQty", 0);
       }
@@ -4488,6 +4490,7 @@ export default {
     listCheck(row) {
       feesCheck(row.fId).then(res => {
         res.data.fFeeUnitid = res.data.fFeeunitid.toString();
+        res.data.fStltypeid = res.data.fStltypeid.toString();
         this.$message.success('请核成功')
         if (res.data.fDc == 'D') {
           let index = this.warehouseDrList.findIndex(item => item.fId == res.data.fId)
@@ -4502,6 +4505,7 @@ export default {
     revokeListCheck(row) {
       revokefeeCheck(row.fId).then(res => {
         res.data.fFeeUnitid = res.data.fFeeunitid.toString();
+        res.data.fStltypeid = res.data.fStltypeid.toString();
         this.$message.success('操作成功')
         if (res.data.fDc == 'D') {
           let index = this.warehouseDrList.findIndex(item => item.fId == res.data.fId)

src/views/Warehousing/inAndOutStock/AddOrUpdate.vue

@@ -7404,7 +7404,7 @@ export default {
             return false;
           } else {
             this.warehouseDrList.push({
-              fCorpid: null,
+              fCorpid: this.form.fCorpid,
               fFeeid: null,
               fFeeUnitid: "",
               fQty: null,
@@ -7441,7 +7441,7 @@ export default {
             return this.$message.error("请维护作业类型");
           } else {
             this.warehouseCrList.push({
-              fCorpid: null,
+              fCorpid: this.form.fCorpid,
               fFeeid: null,
               fFeeUnitid: "",
               fQty: null,
@@ -7613,6 +7613,8 @@ export default {
         this.$set(row, "fQty", (this.fNetweight / 1000).toFixed(2));
       } else if (row.fFeeUnitid === "7") {
         this.$set(row, "fQty", this.fCntqty);
+      } else if (row.fFeeUnitid === "8") {
+        this.$set(row, "fQty", 1);
       } else {
         this.$set(row, "fQty", 0);
       }
@@ -7903,6 +7905,7 @@ export default {
       feesCheck(row.fId).then(res => {
         this.$message.success('请核成功')
         res.data.fFeeUnitid = res.data.fFeeunitid.toString();
+        res.data.fStltypeid = res.data.fStltypeid.toString();
         if (res.data.fDc == 'D') {
           let index = this.warehouseDrList.findIndex(item => item.fId == res.data.fId)
           this.warehouseDrList.splice(index, 1, res.data)
@@ -7916,6 +7919,7 @@ export default {
     revokeListCheck(row) {
       revokefeeCheck(row.fId).then(res => {
         res.data.fFeeUnitid = res.data.fFeeunitid.toString();
+        res.data.fStltypeid = res.data.fStltypeid.toString();
         this.$message.success('操作成功')
         if (res.data.fDc == 'D') {
           let index = this.warehouseDrList.findIndex(item => item.fId == res.data.fId)

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -236,6 +236,7 @@
                 :disabled="detailList.findIndex(function(item){return item.fBillstatus == 40}) == -1?false:true"
                 style="width: 80%"
                 placeholder="请输入模糊查找"
+                @change="fStorekeeperChange"
             >
               <el-option
                   v-for="(item, index) in userOptions"
@@ -532,13 +533,12 @@
             </el-row>
             <el-row>
               <el-col :span="12">
-                <el-form-item label="发货方">
+                <el-form-item label="发货方(货主)">
                   <el-select
                     v-model="form.fShipper"
                     clearable
                     filterable
                     placeholder="请输入关键词"
-                    :disabled="browseStatus || form.warehouseStatus > 3"
                     style="width: 80%"
                     allow-create
                     default-first-option
@@ -1240,6 +1240,7 @@
               >导入Execl
               </el-button
               >
+              <el-button v-if="true" type="success" size="small" @click="openNoUpload" :disabled="browseStatus">智能大数据</el-button>
             </el-col>
             <el-col style="display: flex; justify-content: flex-end">
               <el-button
@@ -2130,7 +2131,7 @@
             </tr>
             <tr>
               <td>保管方</td>
-              <td width="200">{{ company }}</td>
+              <td width="200">{{ fCompanyName? fCompanyName: company }}</td>
               <td>联系人</td>
               <td>{{ form.fContacts }}</td>
               <td>电话</td>
@@ -2605,7 +2606,7 @@
           </div>
           <div style="width: 100%;display: flex">
             <div style="width: 33.333333%">
-              保管方：{{ company }}
+              保管方：{{ fCompanyName? fCompanyName: company }}
             </div>
             <div style="width: 33.333333%">
               联系人：
@@ -4995,7 +4996,7 @@
     >
       <el-radio v-model="radio" :label="1" @change="radioChange">吨（T）</el-radio>
       <el-radio v-model="radio" :label="2" @change="radioChange">千克（KG）</el-radio>
-      <div id="print_area8" class="print-div">
+      <div id="print_area80" class="print-div">
         <div
             class="print-title"
             style="
@@ -5016,34 +5017,34 @@
             <tr>
               <td>品名</td>
               <td colspan="3">{{ form.goodName }}</td>
-              <td colspan="2">清单号</td>
-              <td colspan="3">{{ form.fCustomsdeclartion }}</td>
+              <td colspan="2">提单号</td>
+              <td colspan="3">{{ form.fMblno }}</td>
             </tr>
             <tr>
-              <td class="oneHundredSix" style="width: 160px;">入库日期</td>
-              <td class="twoHundred" style="width: 200px;">箱号</td>
+              <td>入库日期</td>
+              <td>箱号</td>
               <td>铅封号</td>
-              <td>预计件数</td>
-              <td>垛位</td>
-              <td>实收件数</td>
-              <td class="oneHundred" style="width: 100px;" v-if="radio == 1">实收净重（吨）</td>
-              <td class="oneHundred" style="width: 100px;" v-if="radio == 1">毛重（吨）</td>
-              <td class="oneHundred" style="width: 100px;" v-if="radio == 2">实收净重（千克）</td>
-              <td class="oneHundred" style="width: 100px;" v-if="radio == 2">毛重（千克）</td>
-              <td class="twoHundred" style="width: 200px;">备注</td>
+              <td width="6%">预计</td>
+              <td width="8%">垛位</td>
+              <td width="6%">实收</td>
+              <td v-if="radio == 1">实收净重(吨)</td>
+              <td v-if="radio == 1">毛重(吨)</td>
+              <td v-if="radio == 2">实收净重(千克)</td>
+              <td v-if="radio == 2">毛重(千克)</td>
+              <td>备注</td>
             </tr>
             <tr v-for="(item, index) in Printinglist" :key="index">
-              <td>{{ item.fBsdate }}&nbsp;{{ timeOut }}</td>
+              <td>{{ item.fBsdate }}</td>
               <td>{{ item.fCntrno }}</td>
               <td>{{ item.fSealno }}</td>
               <td>{{ item.fQty }}</td>
-              <td>{{ item.fWarehouseInformation }}</td>
+              <td>{{ item.fWarehouseInformation? item.fWarehouseInformation.substring((item.fWarehouseInformation.lastIndexOf("/")) + 1, item.fWarehouseInformation.length): '' }}</td>
               <td>{{ item.fQty }}</td>
               <td v-if="radio == 1">{{ (item.fNetweight / 1000).toSuperFixed(4) }}</td>
               <td v-if="radio == 1">{{ (item.fGrossweight / 1000).toSuperFixed(4) }}</td>
               <td v-if="radio == 2">{{ item.fNetweight }}</td>
               <td v-if="radio == 2">{{ item.fGrossweight }}</td>
-              <td>{{ item.remark }}</td>
+              <td style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap">{{ item.remark }}</td>
             </tr>
             <tr>
               <td>合计：</td>
@@ -5424,30 +5425,30 @@
             <tr>
               <td>箱号</td>
               <td>铅封号</td>
-              <td>预计件数</td>
-              <td>实际件数</td>
+              <td>预计</td>
+              <td>实际</td>
               <td>库位</td>
-              <td>实际入库日期</td>
+              <td>入库日期</td>
               <td>送货车号</td>
               <td>送货司机</td>
               <td>备注</td>
             </tr>
             <tr v-for="(item,index) in Printinglist" :key="index">
-              <td>{{ item.fCntrno }}</td>
-              <td>{{ item.fSealno }}</td>
-              <td>{{ item.fQty }}</td>
-              <td>{{ item.fQty }}</td>
-              <td>{{ item.fWarehouseInformation }}</td>
+              <td width="13%">{{ item.fCntrno }}</td>
+              <td width="13%">{{ item.fSealno }}</td>
+              <td width="5%">{{ item.fQty }}</td>
+              <td width="5%">{{ isfQty == 0? item.fQty: '' }}</td>
+              <td width="10%">{{ isfQty == 0?item.fWarehouseInformation: '' }}</td>
 <!--              <td>{{ item.fBsdate }}&nbsp;{{ timeOut }}</td>-->
-              <td>{{ item.fBsdate }}&nbsp;{{ inTime }}</td>
-              <td>{{ item.fTruckno }}</td>
-              <td>{{ item.fDriverName }}</td>
-              <td>{{ item.remark }}</td>
+              <td width="10%">{{ isfQty == 0? item.fBsdate: '' }}&nbsp;{{ isfQty == 0? inTime: '' }}</td>
+              <td width="10%">{{ item.fTruckno }}</td>
+              <td width="10%">{{ item.fDriverName }}</td>
+              <td width="24%" style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap">{{ item.remark }}</td>
             </tr>
             <tr>
               <td colspan="2">合计：</td>
               <td>{{ allfQty }}</td>
-              <td>{{ allfQty }}</td>
+              <td>{{ isfQty == 0? allfQty: '' }}</td>
               <td></td>
               <td></td>
               <td></td>
@@ -5594,7 +5595,9 @@
       <el-radio v-model="radio" :label="1">吨（T）</el-radio>
       <el-radio v-model="radio" :label="2">千克（KG）</el-radio>
       <div id="print_area99" class="print-div">
-        <div
+        <div v-for="(item, index) in Printinglist"
+             :key="index">
+          <div
             class="print-title"
             style="
                 display: flex;
@@ -5602,179 +5605,92 @@
                 font-size: 24px;
                 margin-bottom: 5px;
               "
-        >
-          {{ fCompanyName? fCompanyName: company }}货物标识卡
-        </div>
-        <div class="print_table" style="display: flex;flex-direction: column">
-          <table border="0" cellspacing="0" cellpadding="0" style="width: 100%" v-for="(item, index) in Printinglist"
-                 :key="index">
-            <tr>
-              <td>货物名称</td>
-              <td colspan="2">{{ form.goodName }}</td>
-              <td>库位</td>
-              <td colspan="2">{{ stockName }}</td>
-            </tr>
-            <tr>
-              <td>提单号</td>
-              <td colspan="2">{{ form.fMblno }}</td>
-              <td>清单号</td>
-              <td colspan="2">{{ form.fCustomsdeclartion }}</td>
-            </tr>
-            <tr>
-              <td>箱号</td>
-              <td colspan="2">{{ item.fCntrno }}</td>
-              <td>总箱量</td>
-              <td colspan="2">{{ item.fCntqty }}</td>
-            </tr>
-            <tr>
-              <td>总件数</td>
-              <td colspan="2">{{ item.fQty }}</td>
-              <td v-if="radio == 1">总净重(吨)</td>
-              <td v-if="radio == 2">总净重(千克)</td>
-              <td v-if="radio == 1" colspan="2">{{ (item.fNetweight / 1000).toFixed(4) }}</td>
-              <td v-if="radio == 2" colspan="2">{{ item.fNetweight }}</td>
-            </tr>
-            <tr>
-              <td v-if="radio == 1">总毛重(吨)</td>
-              <td v-if="radio == 2">总毛重(千克)</td>
-              <td v-if="radio == 1" colspan="2">{{ (item.fGrossweight / 1000).toFixed(4) }}</td>
-              <td v-if="radio == 2" colspan="2">{{ item.fGrossweight }}</td>
-              <td v-if="radio == 1">本垛毛重(吨)</td>
-              <td v-if="radio == 2">本垛毛重(千克)</td>
-              <td v-if="radio == 1" colspan="2">{{ (item.fGrossweight / 1000).toFixed(4) }}</td>
-              <td v-if="radio == 2" colspan="2">{{ item.fGrossweight }}</td>
-            </tr>
-            <tr>
-              <td>本垛件数</td>
-              <td colspan="2">{{ item.fQty }}</td>
-              <td v-if="radio == 1">本垛净重(吨)</td>
-              <td v-if="radio == 2">本垛净重(千克)</td>
-              <td v-if="radio == 1" colspan="2">{{ (item.fNetweight / 1000).toFixed(4) }}</td>
-              <td v-if="radio == 2" colspan="2">{{ item.fNetweight }}</td>
-            </tr>
-            <tr>
-              <td>入库日期</td>
-              <td colspan="2">{{ item.fBsdate }}</td>
-              <td>仓管员</td>
-              <td colspan="2">{{ form.createBy }}</td>
-            </tr>
-            <tr>
-              <td>出库日期</td>
-              <td>出库件数</td>
-              <td>剩余件数</td>
-              <td>出库仓管员</td>
-              <td>盘点日期</td>
-              <td>盘点人</td>
-            </tr>
-            <tr>
-              <td style="height:20px"></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-            </tr>
-            <tr>
-              <td style="height:20px"></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-            </tr>
-            <tr>
-              <td style="height:20px"></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-            </tr>
-            <tr>
-              <td style="height:20px"></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-            </tr>
-            <tr>
-              <td style="height:20px"></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-            </tr>
-            <tr>
-              <td style="height:20px"></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-            </tr>
-            <tr>
-              <td style="height:20px"></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-            </tr>
-            <tr>
-              <td style="height:20px"></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-            </tr>
-            <tr>
-              <td style="height:20px"></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-            </tr>
-            <tr>
-              <td style="height:20px"></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-            </tr>
-            <tr>
-              <td style="height:20px"></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-            </tr>
-            <tr>
-              <td style="height:20px"></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-            </tr>
-            <tr>
-              <td>备注：</td>
-              <td colspan="5">{{ item.remark }}</td>
-            </tr>
-          </table>
-        </div>
-        <div
+          >
+            {{ fCompanyName? fCompanyName: company }}货物标识卡
+          </div>
+          <div class="print_table" style="display: flex;flex-direction: column">
+            <table border="0" cellspacing="0" cellpadding="0" style="width: 100%">
+              <tr>
+                <td>货物名称</td>
+                <td colspan="2">{{ form.goodName }}</td>
+                <td>库位</td>
+                <td colspan="2">{{ stockName }}</td>
+              </tr>
+              <tr>
+                <td>提单号</td>
+                <td colspan="2">{{ form.fMblno }}</td>
+                <td>清单号</td>
+                <td colspan="2">{{ form.fCustomsdeclartion }}</td>
+              </tr>
+              <tr>
+                <td>箱号</td>
+                <td colspan="2">{{ item.fCntrno }}</td>
+                <td>总箱量</td>
+                <td colspan="2">{{ item.fCntqty }}</td>
+              </tr>
+              <tr>
+                <td>总件数</td>
+                <td colspan="2">{{ item.fQty }}</td>
+                <td v-if="radio == 1">总净重(吨)</td>
+                <td v-if="radio == 2">总净重(千克)</td>
+                <td v-if="radio == 1" colspan="2">{{ (item.fNetweight / 1000).toFixed(4) }}</td>
+                <td v-if="radio == 2" colspan="2">{{ item.fNetweight }}</td>
+              </tr>
+              <tr>
+                <td v-if="radio == 1">总毛重(吨)</td>
+                <td v-if="radio == 2">总毛重(千克)</td>
+                <td v-if="radio == 1" colspan="2">{{ (item.fGrossweight / 1000).toFixed(4) }}</td>
+                <td v-if="radio == 2" colspan="2">{{ item.fGrossweight }}</td>
+                <td v-if="radio == 1">本垛毛重(吨)</td>
+                <td v-if="radio == 2">本垛毛重(千克)</td>
+                <td v-if="radio == 1" colspan="2">{{ (item.fGrossweight / 1000).toFixed(4) }}</td>
+                <td v-if="radio == 2" colspan="2">{{ item.fGrossweight }}</td>
+              </tr>
+              <tr>
+                <td>本垛件数</td>
+                <td colspan="2">{{ item.fQty }}</td>
+                <td v-if="radio == 1">本垛净重(吨)</td>
+                <td v-if="radio == 2">本垛净重(千克)</td>
+                <td v-if="radio == 1" colspan="2">{{ (item.fNetweight / 1000).toFixed(4) }}</td>
+                <td v-if="radio == 2" colspan="2">{{ item.fNetweight }}</td>
+              </tr>
+              <tr>
+                <td>入库日期</td>
+                <td colspan="2">{{ item.fBsdate }}</td>
+                <td>仓管员</td>
+                <td colspan="2">{{ form.createBy }}</td>
+              </tr>
+              <tr>
+                <td>出库日期</td>
+                <td>出库件数</td>
+                <td>剩余件数</td>
+                <td>出库仓管员</td>
+                <td>盘点日期</td>
+                <td>盘点人</td>
+              </tr>
+              <tr v-for="index in 31" :key="index">
+                <td style="height:20px"></td>
+                <td></td>
+                <td></td>
+                <td></td>
+                <td></td>
+                <td></td>
+              </tr>
+              <tr style="height: 20px">
+                <td>备注：</td>
+                <td colspan="5">{{ item.remark }}</td>
+              </tr>
+            </table>
+          </div>
+          <div
             style="display: flex; justify-content: space-between; font-size: 12px"
-        >
-          <!--          <div>操作：{{ form.createBy }}</div>-->
-          <div>库管：{{ form.fContacts }}</div>
-          <div style="width: 100px">叉车：</div>
+          >
+            <!--          <div>操作：{{ form.createBy }}</div>-->
+            <div>库管：{{ form.fContacts }}</div>
+            <div style="width: 100px">叉车：</div>
+          </div>
         </div>
+
       </div>
       <span slot="footer" class="dialog-footer">
             <el-button
@@ -5796,7 +5712,7 @@
     >
       <el-radio v-model="radio" :label="1" @change="radioChange">吨（T）</el-radio>
       <el-radio v-model="radio" :label="2" @change="radioChange">千克（KG）</el-radio>
-      <div id="print_area10" class="print-div">
+      <div id="print_area100" class="print-div">
         <div
             class="print-title"
             style="
@@ -5826,23 +5742,26 @@
               "
             class="print_form"
         >
-          <div>客户名称：{{ form.fCorpidName }}</div>
+          <div v-if="form.fShipper">
+            客户名称：{{ form.fShipper | fShipperFormat(fMblnoOptions) }}
+          </div>
+          <div v-else>客户名称：{{ form.fCorpidName }}</div>
           <div>存货地点：{{ stockName }}</div>
         </div>
         <div class="print_table" style="display: flex">
           <table border="0" cellspacing="0" cellpadding="0" style="width: 100%; line-height: 30px">
             <tr>
-              <td>序号</td>
-              <td>实际入库日期</td>
-              <td>商品名称</td>
-              <td>提单号</td>
-              <td>箱号</td>
-              <td>件数</td>
-              <td v-if="radio == 1">毛重（吨）</td>
-              <td v-if="radio == 1">净重（吨）</td>
-              <td v-if="radio == 2">毛重（千克）</td>
-              <td v-if="radio == 2">净重（千克）</td>
-              <td>备注</td>
+              <td width="4%">序号</td>
+              <td width="10%">入库日期</td>
+              <td width="8%">商品名称</td>
+              <td width="15%">提单号</td>
+              <td width="13%">箱号</td>
+              <td width="5%">件数</td>
+              <td v-if="radio == 1" width="8%">毛重(吨)</td>
+              <td v-if="radio == 1" width="8%">净重(吨)</td>
+              <td v-if="radio == 2" width="8%">毛重(千克)</td>
+              <td v-if="radio == 2" width="8%">净重(千克)</td>
+              <td width="13%">备注</td>
             </tr>
             <tr v-for="(item, index) in Printinglist" :key="index">
               <td>{{ index + 1 }}</td>
@@ -5858,7 +5777,7 @@
               <td>{{ item.remark }}</td>
             </tr>
             <tr>
-              <td>合计：</td>
+              <td>合计</td>
               <td></td>
               <td></td>
               <td></td>
@@ -6196,6 +6115,14 @@
         @changeShow="showAddOrUpdate2"
         @adddetailList="adddetailList"
     ></upload-excel>
+    <no-upload
+      ref="noUpload"
+      v-if="noUploadVisible"
+      :oldList="detailList"
+      :form="form"
+      @closeDialog="closeNoUpload"
+      @addDetailList="addDetailList"
+    ></no-upload>
     <div style="display: flex; justify-content: flex-end; margin-top: 10px">
       <!-- 弹窗, 新增 / 修改 -->
       <add-or-update
@@ -6316,6 +6243,7 @@ import upLoad from "../components/upLoad";
 import incomeMoney from "../components/incomeMoney";
 import payMoney from "../components/payMoney";
 import uploadExcel from "./uploadExcel";
+import noUpload from "./noUpload";
 import { getDept } from "@/api/basicdata/dept";
 
 export default {
@@ -6339,7 +6267,8 @@ export default {
     upLoad,
     incomeMoney,
     payMoney,
-    uploadExcel
+    uploadExcel,
+    noUpload
   },
   data() {
     return {
@@ -6734,6 +6663,7 @@ export default {
       weighedRequired: 1,
       inTime: '',
       bring: null,
+      isfQty:null,
       // 选择打印抬头中文名
       fCompanyName: '',
       printFeeConfirm: {
@@ -6743,6 +6673,7 @@ export default {
         fTel: '',
         fTax: '',
       },
+      noUploadVisible: false, //上传弹窗
     };
   },
   created() {
@@ -6758,6 +6689,7 @@ export default {
     });
     this.getDicts("data_stltype_type").then((response) => {
       this.fStltypeOptions = response.data;
+      console.log(this.fStltypeOptions)
     });
     this.getDicts("data_unitfees").then((response) => {
       this.fFeetUnitOptions = response.data;
@@ -6810,6 +6742,9 @@ export default {
     this.getConfigKey("warehouse.inStock.bring").then((response) => {
       this.bring = response.msg;
     });
+    this.getConfigKey("warehouse.inStock.isfQty").then((response) => {
+      this.isfQty = response.msg;
+    });
     //货值是否显示
     // this.getConfigKey("show_fValue").then((response) => {
     //   this.showfValue = response.msg;
@@ -6970,6 +6905,15 @@ export default {
       });
       return name;
     },
+    fShipperFormat(row, fMblnoOptions) {
+      let name;
+      fMblnoOptions.map((e) => {
+        if (row == e.fCname) {
+          name = e.fName;
+        }
+      });
+      return name;
+    },
     fBsdateFormat(row) {
       if (row) {
         const dateMat = new Date(row);
@@ -8291,7 +8235,7 @@ export default {
             return false;
           } else {
             this.warehouseDrList.push({
-              fCorpid: null,
+              fCorpid: this.form.fCorpid,
               fFeeid: null,
               fFeeUnitid: "",
               fQty: null,
@@ -8472,6 +8416,7 @@ export default {
       }
     },
     imporComputer() {
+      return
       this.playcomputer();
     },
     // 入库明细新增list
@@ -8906,7 +8851,7 @@ export default {
             return this.$message.error("请维护作业类型");
           } else {
             this.warehouseCrList.push({
-              fCorpid: null,
+              fCorpid: this.form.fCorpid,
               fFeeid: null,
               fFeeUnitid: "",
               fQty: null,
@@ -8942,6 +8887,7 @@ export default {
           this.$set(this.form, "fDeptid", this.userVal.deptId);
           this.$set(this.form, "createBy", this.userVal.userName);
           this.$set(this.form, "fStorekeeper", this.userVal.nickName);
+          this.$set(this.form, "fContacts", this.userVal.nickName);
           this.$set(this.form, "fIfdamage", "1");
           this.$set(this.form, "fIfweigh", "1");
           this.$set(this.form, "fTrademodeid", "1");
@@ -9140,7 +9086,7 @@ export default {
               "@page {  } " +
               "@media print {.oneHundred{width: 100px} .twoHundred{width: 200px} .oneHundredSix{width: 160px} .print-div{ padding:8px;background-color:#cccccc;} .print-title{display:flex;justify-content: center;font-size:24px} .print_form{font-size:12px} .print_table table {border-right: 1px solid #000;border-bottom: 1px solid #000;font-size:12px} .print_table table td {border-left: 1px solid #000;border-top: 1px solid #000;padding:2px;vertical-align:middle;text-align: center;}";
           print({
-            printable: "print_area8",
+            printable: "print_area80",
             type: "html",
             style: stylEe, // 亦可使用引入的外部css;
             scanStyles: false,
@@ -9156,7 +9102,7 @@ export default {
           break
         case 'khrkd':
           print({
-            printable: "print_area10",
+            printable: "print_area100",
             type: "html",
             style: style, // 亦可使用引入的外部css;
             scanStyles: false,
@@ -9369,7 +9315,7 @@ export default {
     // 获取仓库信息
     warehouseChange() {
       getDept(this.form.fWarehouseid).then(res => {
-        this.$set(this.form, 'fContacts', res.data.fContacts)
+        // this.$set(this.form, 'fContacts', res.data.fContacts)
         this.$set(this.form, 'fTel', res.data.fTel)
       })
     },
@@ -9406,7 +9352,23 @@ export default {
           this.goodsOptions = response.rows;
         });
       }
-      console.log(this.form.fFeetUnit)
+    },
+    openNoUpload() {
+      if (!this.form.fMblno) return this.$message.error('请维护提单号')
+      this.noUploadVisible = true;
+      this.$nextTick(() => {
+        this.$refs.noUpload.init()
+      })
+    },
+    // 关闭弹窗
+    closeNoUpload() {
+      this.noUploadVisible = false
+    },
+    addDetailList(list) {
+      this.detailList.push(...list);
+    },
+    fStorekeeperChange() {
+      this.$set(this.form, 'fContacts', this.form.fStorekeeper)
     },
   },
   watch: {

src/views/Warehousing/inStock/noUpload.vue

@@ -0,0 +1,751 @@
+<template>
+  <el-dialog
+    title="导入"
+    :visible.sync="visible"
+    width="85%"
+    v-dialogDrag
+    :append-to-body="true"
+    :close-on-click-modal="false"
+    :before-close="closeDialog"
+  >
+    <!--      列设置-->
+    <el-dialog title="提示" :visible.sync="showSetting" width="700px" v-dialogDrag append-to-body>
+      <template slot="title">
+        <div class="avue-crud__dialog__header">
+            <span class="el-dialog__title">
+            <span
+              style="display:inline-block;width:3px;height:20px;margin-right:5px; float: left;margin-top:2px"></span>
+            </span>
+        </div>
+      </template>
+      <div>配置排序列数据（拖动调整顺序）</div>
+      <div style="margin-left: 17px">
+        <el-checkbox
+          v-model="allCheck"
+          label="全选"
+          @change="allChecked"
+        ></el-checkbox>
+      </div>
+      <div style="padding: 4px; display: flex; justify-content: center">
+        <draggable
+          v-model="setRowList"
+          group="site"
+          animation="300"
+          @start="onStart"
+          @end="onEnd"
+          handle=".indraggable"
+        >
+          <transition-group>
+            <div
+              v-for="item in setRowList"
+              :key="item.surface"
+              class="listStyle"
+            >
+              <div style="width: 500px" class="indraggable">
+                <div class="progress" :style="{ width: item.width + 'px' }">
+                  <el-checkbox
+                    :label="item.name"
+                    v-model="item.checked"
+                    :true-label="0"
+                    :false-label="1"
+                  >{{ item.name }}
+                  </el-checkbox>
+                </div>
+              </div>
+              <el-input-number
+                v-model.number="item.width"
+                controls-position="right"
+                :min="1"
+                :max="500"
+                size="mini"
+              ></el-input-number>
+            </div>
+          </transition-group>
+        </draggable>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="showSetting = false">取 消</el-button>
+        <el-button @click="delRow" type="danger">重 置</el-button>
+        <el-button type="primary" @click="save()">确 定</el-button>
+      </span>
+    </el-dialog>
+    <div style="margin: 0 10px;float: right">
+      <el-button
+        icon="el-icon-setting"
+        size="mini"
+        circle
+        @click="showSetting = !showSetting"
+      ></el-button>
+    </div>
+    <el-table
+      ref="table"
+      :data="dataList"
+      tooltip-effect="dark"
+      stripe
+      v-loading="loading"
+      @selection-change="handleSelection"
+      :height="tableHeight"
+    >
+      <el-table-column type="selection" width="50" align="center" fixed/>
+      <el-table-column
+        label="序号"
+        type="index"
+        width="50"
+        fixed
+        align="center"
+      />
+      <el-table-column
+        v-for="(item, index) in getRowList"
+        :key="index"
+        :label="item.name"
+        :width="item.width"
+        :prop="item.label"
+        align="center"
+        :fixed="item.fixed"
+        sortable
+      >
+        <template slot-scope="scope">
+            <span v-if="item.label == 'fBsdate'">
+              <el-date-picker
+                v-model="scope.row.fBsdate"
+                type="date"
+                style="width: 100%"
+                value-format="timestamp"
+                placeholder="入库日期"
+                @change="dateSelected(scope,'fBsdate')"
+              >
+              </el-date-picker>
+            </span>
+          <span v-else-if="item.label == 'fGoodsid'">
+              <el-select
+                filterable
+                v-model="scope.row.fGoodsid"
+                style="width: 100%"
+                placeholder="请选择品名"
+                @change="dateSelected(scope,'fGoodsid')"
+              >
+                <el-option
+                  v-for="(item, index) in goodsOptions"
+                  :key="index.fId"
+                  :label="item.fName"
+                  :value="item.fId"
+                ></el-option>
+              </el-select>
+            </span>
+          <span v-else-if="item.label == 'fBusinessType'">
+              <el-select
+                filterable
+                v-model="scope.row.fBusinessType"
+                style="width: 100%"
+                placeholder="请选择商品属性"
+                @change="dateSelected(scope,'fBusinessType')"
+              >
+                <el-option
+                  v-for="(item, index) in fStorageTypeOptions"
+                  :key="index.dictValue"
+                  :label="item.dictLabel"
+                  :value="item.dictValue"
+                />
+              </el-select>
+            </span>
+          <span v-else-if="item.label == 'fMarks'">
+              <el-input
+                v-model="scope.row.fMarks"
+                style="width: 100%"
+                placeholder="请填写属性描述"
+                @change="dateSelected(scope,'fMarks')"
+              />
+            </span>
+          <span v-else-if="item.label == 'fWarehouseInformation'">
+              <el-input
+                placeholder="请选择"
+                v-model="scope.row.fWarehouseInformation"
+                @focus="getTreeselect(scope)"
+              >
+              </el-input>
+            </span>
+          <span v-else-if="item.label == 'fQty'">
+              <el-input
+                v-input-limit="0"
+                v-model.number="scope.row.fQty"
+                style="width: 100%"
+                placeholder="件数"
+                @change="dateSelected(scope,'fQty')"
+              />
+            </span>
+          <span v-else-if="item.label == 'fGrossweight'">
+              <el-input
+                v-model.number="scope.row.fGrossweight"
+                v-input-limit="2"
+                style="width: 100%"
+                placeholder="毛重"
+                @change="dateSelected(scope,'fGrossweight')"
+              />
+            </span>
+          <span v-else-if="item.label == 'fNetweight'">
+              <el-input
+                v-model.number="scope.row.fNetweight"
+                v-input-limit="2"
+                style="width: 100%"
+                placeholder="净重"
+                @change="dateSelected(scope,'fNetweight')"
+              />
+            </span>
+          <span v-else-if="item.label == 'fPackagespecs'">
+              <el-input
+                v-model="scope.row.fPackagespecs"
+                style="width: 100%"
+                placeholder="包装规格"
+              />
+            </span>
+<!--          <span v-else-if="item.label == 'fCntrno'">-->
+<!--              <el-input-->
+<!--                v-model="scope.row.fCntrno"-->
+<!--                style="width: 100%"-->
+<!--                placeholder="箱号"-->
+<!--                v-Alphabet-->
+<!--                @change="unRepeat(scope.row.fCntrno, scope.$index)"-->
+<!--              />-->
+<!--            </span>-->
+          <span v-else-if="item.label == 'fTruckno'">
+              <el-input
+                v-model="scope.row.fTruckno"
+                style="width: 100%"
+                placeholder="车号"
+                v-Alphabet
+              />
+            </span>
+          <span v-else>{{ scope.row[item.label] }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="操作"
+        width="80px"
+        fixed="right">
+        <template slot-scope="{row, $index}">
+          <el-button
+            @click.native.prevent="deleteRow($index)"
+            size="small"
+          >移除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <el-dialog
+      title="选择库位"
+      :data="treeselectList"
+      :visible.sync="choiceWarehouse"
+      width="30%"
+      :close-on-click-modal="false"
+      append-to-body
+    >
+      <treeselect
+        v-model="treeselectList.fWarehouselocid"
+        @select="getAlltree"
+        :options="fWarehouseidOptions"
+        :show-count="true"
+        :disable-branch-nodes="true"
+        placeholder="请选择归属库区"
+      />
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="choiceWarehouse = false">取 消</el-button>
+        <el-button type="primary" @click="confirm">确 定</el-button>
+      </span>
+    </el-dialog>
+
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible = false" :loading="buttonLoading">取 消</el-button>
+      <el-button type="primary" @click="importData" :loading="buttonLoading">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import Cookies from "js-cookie";
+import {addSet, resetModule, select} from '@/api/system/set';
+import draggable from "vuedraggable";
+import {getToken} from "@/utils/auth";
+import {listGoods} from "@/api/basicdata/goods";
+import {treeselect} from "@/api/basicdata/warehouse";
+import {getCrawler} from "@/api/warehouseBusiness/warehouseInStock"
+import axios from "axios";
+import Treeselect from "@riophae/vue-treeselect";
+
+export default {
+  name: "noUpload",
+  components: {
+    draggable,
+    Treeselect
+  },
+  props: {
+    oldList: {
+      type: Array,
+      default: []
+    },
+    form: {
+      type: Object
+    },
+  },
+  data() {
+    return {
+      visible: false,
+      dataList: [],
+      loading: false,
+      buttonLoading: false,
+      tableHeight: '200',
+      selection: [],
+      goodsOptions: [],
+      fStorageTypeOptions: [],
+      fWarehouseidOptions: [],
+      treeselectList: {
+        fWarehouselocid: null,
+      },
+      choiceWarehouse: false,
+      TreeIndex: null,
+      bigDataToken: null,
+      page: {
+        pageNum: 1,
+        pageSize: 10,
+        total: 0,
+      },
+
+      // 设置列开关
+      showSetting: false,
+      setRowList: [],
+      getRowList: [],
+      showfCustomno: null,
+      //自定义列宽
+      allCheck: false,
+      drag: false,
+      tableDate: [
+        {
+          surface: "1",
+          label: "fBsdate",
+          name: "入库日期",
+          checked: 0,
+          width: 160,
+        },
+        {
+          surface: "2",
+          label: "fGoodsid",
+          name: "品名",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "3",
+          label: "fBusinessType",
+          name: "货物属性",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "4",
+          label: "fMarks",
+          name: "属性详情",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "5",
+          label: "fWarehouseInformation",
+          name: "库区",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "6",
+          label: "fQty",
+          name: "件数",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "7",
+          label: "fGrossweight",
+          name: "毛重(kg)",
+          checked: 0,
+          width: 130,
+        },
+
+        {
+          surface: "8",
+          label: "fNetweight",
+          name: "净重(kg)",
+          checked: 0,
+          width: 130,
+        },
+        {
+          surface: "9",
+          label: "fPackagespecs",
+          name: "包装规格",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "10",
+          label: "fCntrno",
+          name: "箱号",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "11",
+          label: "fSealno",
+          name: "封号",
+          checked: 0,
+          width: 180,
+        },
+        {
+          surface: "12",
+          label: "fTruckno",
+          name: "车号",
+          checked: 0,
+          width: 100,
+        },
+      ],
+    }
+  },
+  created() {
+    this.setRowList = this.tableDate;
+    this.getRowList = this.tableDate;
+    this.getRow();
+    listGoods({fStatus: 0, delFlag: 0}).then((response) => {
+      this.goodsOptions = response.rows;
+    });
+    treeselect(this.form.fWarehouseid).then((response) => {
+      this.fWarehouseidOptions = response.data;
+    });
+    this.getDicts("storage_type").then((response) => {
+      this.fStorageTypeOptions = response.data;
+    });
+  },
+  mounted() {
+    this.$nextTick(() => {
+      // 监听浏览器高度变化，改变表格高度
+      window.onresize = () => {
+        this.tableHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 200
+      }
+    })
+  },
+  methods: {
+    // 打开
+    async init() {
+      this.dataList = []
+      await this.getConfigKey("bigData.token").then((response) => {
+        this.bigDataToken = response.msg;
+      });
+      this.getList()
+      this.visible = true;
+    },
+    // 关闭弹窗
+    closeDialog() {
+      this.visible = false;
+      this.detailList = []
+      this.$emit("closeDialog")
+    },
+    getList() {
+      this.loading = true;
+      axios({
+          // url: 'http://192.168.1.114:9002/crawler/' + this.form.fMblno,
+        url: 'https://crawler.tubaosoft.com/prod-api/crawler/data',
+        method: 'post',
+        data: {
+          token: this.bigDataToken,
+          param: this.form.fMblno,
+          size: this.page.pageSize,
+          page: this.page.pageNum
+        },
+        headers: {
+          "Content-Type":'application/json'
+        }
+        }
+      ).then(res => {
+        if (res.data.code == 500) {
+          return this.$message.error(res.data.msg)
+        }
+        //SEAL_NO 铅封号
+        //CONTAINER_NO 箱号
+        //CARGO_QUANTITY 件数
+        //TOTAL_GROSS_WEIGHT 重量
+        //BILL_OF_LADING_NO 提单号
+        if (res.data.data[1].data.length == 0) {
+          // XH 箱号
+          // QFH1 铅封号
+          // MZ 箱整重
+          //TDH 提单号
+          res.data.data[0].data.map(e => {
+            e.fMblno = e.TDH;
+            e.fSealno = e.QFH1;
+            e.fGrossweight = e.MZ;
+            e.fNetweight = e.MZ;
+            e.fCntrno = e.XH;
+          })
+          // if (res.data.data[0].data.length == 1) {
+          //   res.data.data[0].data.map(e => {
+          //     e.fGrossweight = e.MZ;
+          //     e.fNetweight = e.MZ;
+          //   })
+          // } else {
+          //   res.data.data[0].data.map(e => {
+          //     e.fGrossweight = '';
+          //     e.fNetweight = '';
+          //   })
+          // }
+          this.dataList = res.data.data[0].data
+        } else {
+          res.data.data[1].data.map(e => {
+            e.fMblno = e.BILL_OF_LADING_NO;
+            e.fSealno = e.SEAL_NO;
+            // e.fQty = e.CARGO_QUANTITY;
+            // e.fGrossweight = e.TOTAL_GROSS_WEIGHT;
+            // e.fNetweight = e.TOTAL_GROSS_WEIGHT;
+            e.fCntrno = e.CONTAINER_NO;
+          })
+          if (res.data.data[1].data.length == 1) {
+            res.data.data[1].data.map(e => {
+              e.fQty = e.CARGO_QUANTITY;
+              e.fGrossweight = e.TOTAL_GROSS_WEIGHT;
+              e.fNetweight = e.TOTAL_GROSS_WEIGHT;
+            })
+          } else {
+            res.data.data[1].data.map(e => {
+              e.fQty = '';
+              e.fGrossweight = '';
+              e.fNetweight = '';
+            })
+          }
+          this.dataList = res.data.data[1].data
+        }
+        if (this.dataList.length > 0) {
+          this.dataList.map(e => {
+            this.$set(e, 'fBsdate', this.form.fBsdate);
+            this.$set(e, 'fGoodsid', this.form.fGoodsid);
+            this.$set(e, 'fBillstatus', 10)
+          })
+        }
+        setTimeout(() => {
+          this.tableHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 200
+        }, 300)
+        this.loading = false;
+      }).finally(() => {
+        this.loading = false;
+      })
+    },
+    handleSelection(list) {
+      this.selection = list
+    },
+    dateSelected(scope, name) {
+      if (name === 'fBsdate') {
+        this.dataList.forEach(item => {
+          if (!item.fBsdate) this.$set(item, 'fBsdate', scope.row.fBsdate)
+        })
+      } else if (name === 'fGoodsid') {
+        this.dataList.forEach(item => {
+          if (!item.fGoodsid) this.$set(item, 'fGoodsid', scope.row.fGoodsid)
+        })
+      } else if (name === 'fBusinessType') {
+        this.dataList.forEach(item => {
+          if (!item.fBusinessType) this.$set(item, 'fBusinessType', scope.row.fBusinessType)
+        })
+      } else if (name === 'fMarks') {
+        this.dataList.forEach(item => {
+          if (!item.fMarks) this.$set(item, 'fMarks', scope.row.fMarks)
+        })
+      } else if (name === 'fQty') {
+        this.dataList.forEach(item => {
+          if (!item.fQty) this.$set(item, 'fQty', scope.row.fQty)
+        })
+      } else if (name === 'fGrossweight') {
+        this.dataList.forEach(item => {
+          if (!item.fGrossweight) this.$set(item, 'fGrossweight', scope.row.fGrossweight)
+        })
+      } else if (name === 'fNetweight') {
+        this.dataList.forEach(item => {
+          if (!item.fNetweight) this.$set(item, 'fNetweight', scope.row.fNetweight)
+        })
+      }
+    },
+    getTreeselect(row) {
+      this.treeselectList.fWarehouselocid = row.row.fWarehouselocid
+        ? row.row.fWarehouselocid
+        : null;
+      this.TreeIndex = row.$index;
+      this.choiceWarehouse = true;
+    },
+    getAlltree(tree) {
+      this.information = tree.fWarehouseInformation;
+    },
+    confirm() {
+      this.$set(
+        this.dataList[this.TreeIndex],
+        "fWarehouseInformation",
+        this.information
+      );
+      this.$set(
+        this.dataList[this.TreeIndex],
+        "fWarehouselocid",
+        this.treeselectList.fWarehouselocid
+      );
+      this.choiceWarehouse = false;
+    },
+    unRepeat(row, index) {
+      this.oldList.map((e) => {
+        if (row == e.fCntrno) {
+          this.dataList[index].fCntrno = null;
+          this.$message.error("该箱号和明细表上的存在重复");
+        }
+      });
+      this.dataList.map((e, i) => {
+        if (index != i) {
+          if (row && row == e.fCntrno) {
+            this.dataList[index].fCntrno = null;
+            this.$message.error("该箱号存在重复");
+          }
+        }
+      });
+    },
+    importData() {
+      if (this.dataList.length == 0) {
+        return this.$message.error('表格未有数据，请关闭')
+      }
+      for (let item in this.dataList) {
+        if (this.dataList[item].fBsdate == null) {
+          return this.$message.error(
+            "请选择第" + (Number(item) + 1) + "行的入库日期"
+          );
+        }
+        if (this.dataList[item].fGoodsid == null) {
+          return this.$message.error(
+            "请选择第" + (Number(item) + 1) + "行的品名"
+          );
+        }
+        if (this.dataList[item].fBusinessType == null) {
+          return this.$message.error(
+            "请选择第" + (Number(item) + 1) + "行的货物属性"
+          );
+        }
+        if (this.dataList[item].fMarks == null) {
+          return this.$message.error(
+            "请输入第" + (Number(item) + 1) + "行的属性详情"
+          );
+        }
+        if (this.dataList[item].fQty == null) {
+          return this.$message.error(
+            "请输入第" + (Number(item) + 1) + "行的件数"
+          );
+        }
+        if (this.dataList[item].fGrossweight == null) {
+          return this.$message.error(
+            "请输入第" + (Number(item) + 1) + "行的毛重"
+          );
+        }
+        if (this.dataList[item].fNetweight == null) {
+          return this.$message.error(
+            "请输入第" + (Number(item) + 1) + "行的净重"
+          );
+        }
+      }
+      this.buttonLoading = true;
+      axios({
+        url: 'https://crawler.tubaosoft.com/prod-api/crawler/charge',
+        method: 'post',
+        data: {
+          token: this.bigDataToken,
+          param: this.form.fMblno,
+        },
+      }).then(res => {
+        if (res.data.code == 500) {
+          return this.$message.error(res.data.msg)
+        }
+        this.$emit('addDetailList', this.dataList)
+        this.buttonLoading = false;
+        this.visible = false;
+      }).finally(() => {
+        this.buttonLoading = false;
+      })
+    },
+    deleteRow(index) {
+      this.dataList.splice(index, 1)
+    },
+
+    //列设置全选
+    allChecked() {
+      if (this.allCheck == true) {
+        this.setRowList.map((e) => {
+          return (e.checked = 0);
+        });
+      } else {
+        this.setRowList.map((e) => {
+          return (e.checked = 1);
+        });
+      }
+    },
+    //开始拖拽事件
+    onStart() {
+      this.drag = true;
+    },
+    //拖拽结束事件
+    onEnd() {
+      this.drag = false;
+    },
+    //重置列表
+    delRow() {
+      this.data = {
+        tableName: "单号导入",
+        userId: Cookies.get("userName"),
+      };
+      resetModule(this.data).then((res) => {
+        if (res.code == 200) {
+          this.showSetting = false;
+          this.setRowList = this.tableDate;
+          console.log(this.setRowList)
+          this.getRowList = this.tableDate;
+        }
+      });
+    },
+    //保存列设置
+    save() {
+      this.showSetting = false;
+      this.data = {
+        tableName: "单号导入",
+        userId: Cookies.get("userName"),
+        sysTableSetList: this.setRowList,
+      };
+      addSet(this.data).then((res) => {
+        this.getRowList = this.setRowList.filter((e) => e.checked == 0);
+      });
+    },
+    //查询列数据
+    getRow() {
+      let that = this;
+      this.data = {
+        tableName: "单号导入",
+        userId: Cookies.get("userName"),
+      };
+      select(this.data).then((res) => {
+        if (res.data.length != 0) {
+          this.getRowList = res.data.filter((e) => e.checked == 0);
+          this.setRowList = res.data;
+          this.setRowList = this.setRowList.reduce((res, item) => {
+            res.push({
+              surface: item.surface,
+              label: item.label,
+              name: item.name,
+              checked: item.checked,
+              width: item.width,
+              fixed: item.fixed,
+            });
+            return res;
+          }, []);
+        }
+      });
+    },
+  },
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/Warehousing/stockTransfer/AddOrUpdate.vue

@@ -6016,7 +6016,7 @@ export default {
             return false;
           } else {
             this.warehouseDrList.push({
-              fCorpid: null,
+              fCorpid: this.form.fCorpid,
               fFeeid: null,
               fFeeUnitid: "",
               fQty: null,
@@ -6052,7 +6052,7 @@ export default {
             return this.$message.error("请维护作业类型");
           } else {
             this.warehouseCrList.push({
-              fCorpid: null,
+              fCorpid: this.form.fCorpid,
               fFeeid: null,
               fFeeUnitid: "",
               fQty: null,
@@ -6481,6 +6481,7 @@ export default {
       feesCheck(row.fId).then(res => {
         this.$message.success('请核成功')
         res.data.fFeeUnitid = res.data.fFeeunitid.toString();
+        res.data.fStltypeid = res.data.fStltypeid.toString();
         if (res.data.fDc == 'D') {
           let index = this.warehouseDrList.findIndex(item => item.fId == res.data.fId)
           this.warehouseDrList.splice(index, 1, res.data)
@@ -6495,6 +6496,7 @@ export default {
     revokeListCheck(row) {
       revokefeeCheck(row.fId).then(res => {
         res.data.fFeeUnitid = res.data.fFeeunitid.toString();
+        res.data.fStltypeid = res.data.fStltypeid.toString();
         this.$message.success('操作成功')
         if (res.data.fDc == 'D') {
           let index = this.warehouseDrList.findIndex(item => item.fId == res.data.fId)

src/views/basicdata/corps/index.vue

@@ -813,7 +813,7 @@ import { isArray } from "@/utils/validate";
 import { addSet, select, resetModule } from "@/api/system/set";
 import Cookies from "js-cookie";
 import draggable from "vuedraggable";
-import { treeselect } from "@/api/system/dept";
+import { treeselect, belongSelect} from "@/api/system/dept";
 import upLoad from "@/views/Warehousing/components/upLoad";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -1073,7 +1073,10 @@ export default {
   },
   methods: {
     getTreeselect() {
-      treeselect().then((response) => {
+      // treeselect().then((response) => {
+      //   this.deptOptions = response.data;
+      // });
+      belongSelect().then((response) => {
         this.deptOptions = response.data;
       });
     },

src/views/reportManagement/Statistics/index.vue

@@ -595,7 +595,7 @@ export default {
         {
           surface: "2",
           label: "fBsdate",
-          name: "入库日期",
+          name: "业务日期",
           checked: 0,
           width: 100,
           fixed: "left",