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

package.json

@@ -45,7 +45,7 @@
     "clipboard": "2.0.4",
     "core-js": "3.6.5",
     "corps": "^0.1.0",
-    "echarts": "4.2.1",
+    "echarts": "^4.2.1",
     "element-ui": "2.14.1",
     "file-saver": "2.0.1",
     "fuse.js": "3.4.4",

src/App.vue

@@ -51,4 +51,31 @@ export default {
 .el-input.is-disabled .el-input__inner {
     color: #000000 !important;
 }
+.el-table__body-wrapper{
+  overflow: auto;
+  position: unset;
+}
+.el-table--scrollable-x .el-table__body-wrapper{
+  overflow-x: auto;
+}
+
+.el-table__body-wrapper::-webkit-scrollbar {
+  width: 8px;
+  height: 8px;
+}
+
+.el-table__body-wrapper::-webkit-scrollbar-thumb {
+  border-radius: 5px;
+  height: 100px;
+  background: #afafaf;
+}
+
+.el-table__body-wrapper::-webkit-scrollbar-track {
+  box-shadow: inset 0 0 5px rgba(255, 255, 255, 1);
+  border-radius: 5px;
+  background: rgba(255, 255, 255, 1);
+}
+.el-table__body-wrapper {
+  background: #ffffff;
+}
 </style>

src/api/index.js

@@ -77,3 +77,17 @@ export function remindExpirationData(query){
     params: query
   })
 }
+// 财务图表
+export function getFeeStatistics(){
+  return request({
+    url:'/basicdata/fees/getFeeStatistics',
+    method:'get'
+  })
+}
+// 客户欠款
+export function getArrearsStatistics(){
+  return request({
+    url:'/basicdata/fees/getArrearsStatistics',
+    method:'get'
+  })
+}

src/api/otherFinancial/index.js

@@ -0,0 +1,64 @@
+import request from '@/utils/request'
+
+// 查询客户详情列表
+export function listCorps(query) {
+    return request({
+        // url: '/basicdata/corps/selectCustomerDriverList',
+        url: '/basicdata/corps/list',
+        method: 'get',
+        params: query
+    })
+}
+// 查询客户详情列表
+export function listCorps_s(query) {
+    return request({
+        url: '/warehouseBusiness/otherFees/list',
+        method: 'get',
+        params: query
+    })
+}
+// 查询单条数据
+export function single(fId) {
+    return request({
+        // url: '/basicdata/corps/selectCustomerDriverList',
+        url: '/warehouseBusiness/otherFees/' + fId,
+        method: 'get',
+    })
+}
+// 新增
+export function preservation(data) {
+    return request({
+        url: '/warehouseBusiness/otherFees/save',
+        method: 'post',
+        data: data
+    })
+}
+// 删除
+export function singleDeletion(fId) {
+    return request({
+        url: '/warehouseBusiness/otherFees/remove/' + fId,
+        method: 'get'
+    })
+}
+// 撤销
+export function revokeContainerPort(fId) {
+    return request({
+        url: '/warehouseBusiness/otherFees/revoke/' + fId,
+        method: 'get'
+    })
+}
+// 提交
+export function submit(data) {
+    return request({
+        url: '/warehouseBusiness/otherFees/add',
+        method: 'post',
+        data: data
+    })
+}
+// 基础资料
+export function allInformation() {
+    return request({
+        url: '/warehouseBusiness/containerPort/selectBasicInformation',
+        method: 'get',
+    })
+}

src/assets/styles/sidebar.scss

@@ -201,7 +201,6 @@
   >.el-menu--popup {
     max-height: 100vh;
     overflow-y: auto;
-
     &::-webkit-scrollbar-track-piece {
       background: #d3dce6;
     }

src/settings.js

@@ -1,5 +1,5 @@
 module.exports = {
-  title: '途宝智慧云仓平台',
+  title: '智慧云仓平台',
 
   /**
    * 侧边栏主题 深色主题theme-dark，浅色主题theme-light

src/views/Warehousing/goodsTransfer/AddOrUpdate.vue

@@ -252,10 +252,9 @@
               placeholder="请输入关键词"
               style="width: 80%"
               @change="changePrint"
-              :disabled="browseStatus || form.warehouseStatus > 3"
             >
               <el-option
-                v-for="(item, index) in fMblnoOptions"
+                v-for="(item, index) in battributionList"
                 :key="index.fId"
                 :label="item.fName"
                 :value="item.fId"
@@ -639,9 +638,7 @@
       <el-collapse-item>
         <template slot="title">
           <i class="el-icon-s-order" style="font-size: 16px"></i>
-          <span style="font-size: 16px; font-weight: bolder; margin-left: 5px"
-            >附件明细</span
-          >
+          <span style="font-size: 16px; font-weight: bolder; margin-left: 5px">附件明细</span>
         </template>
         <up-load
           :relevantAttachments="relevantAttachments"
@@ -653,9 +650,7 @@
       <el-collapse-item>
         <template slot="title">
           <i class="el-icon-circle-plus" style="font-size: 16px"></i>
-          <span style="font-size: 16px; font-weight: bolder; margin-left: 5px"
-            >收款信息</span
-          >
+          <span style="font-size: 16px; font-weight: bolder; margin-left: 5px">收款信息</span>
         </template>
         <div
           class="dialogTableTitle flex a-center jlr"
@@ -664,29 +659,25 @@
             justify-content: space-between;
             align-items: center;
             margin: 10px 0;
-          "
-        >
+          ">
           <div>
             <el-button
               size="small"
               type="primary"
               :disabled="browseStatus"
-              @click.prevent="addCollection()"
-              >新行
+              @click.prevent="addCollection()">新行
             </el-button>
             <el-button
               type="primary"
               size="small"
               :disabled="browseStatus"
               @click="saveForm"
-              >保 存</el-button
-            >
+              >保 存</el-button>
             <el-button
               size="small"
               @click.prevent="handleSelect(3)"
               type="danger"
-              >作业费协议</el-button
-            >
+              >作业费协议</el-button>
             <el-button
               size="small"
               type="primary"
@@ -697,8 +688,7 @@
               type="primary"
               size="small"
               v-if="browseStatus"
-              @click="feeChange('D')"
-            >
+              @click="feeChange('D')">
               费用变更
             </el-button>
           </div>
@@ -792,22 +782,19 @@
             header-align="center"
             align="center"
             width="180px"
-            label="计价单位"
-          >
+            label="计价单位">
             <template slot-scope="scope">
               <el-select
                 v-model="scope.row.fFeeUnitid"
                 placeholder="请选择计价单位"
                 clearable
                 :disabled="browseStatus || scope.row.fBillstatus == 6"
-                @change="changeFeeUnit(scope.row)"
-              >
+                @change="changeFeeUnit(scope.row)">
                 <el-option
                   v-for="(item, index) in fFeetUnitOptions"
                   :key="index.dictValue"
                   :label="item.dictLabel"
-                  :value="item.dictValue"
-                />
+                  :value="item.dictValue"/>
               </el-select>
             </template>
           </el-table-column>
@@ -816,8 +803,7 @@
             header-align="center"
             align="center"
             width="130px"
-            label="数量"
-          >
+            label="数量">
             <template slot-scope="scope">
               <el-input
                 oninput='this.value=this.value.replace(/[^0-9.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d).*$/,"$1$2.$3")'
@@ -825,8 +811,7 @@
                 placeholder="数量"
                 :disabled="browseStatus || scope.row.fBillstatus == 6"
                 @change="changeContractAmt(scope.row)"
-                show-word-limit
-              />
+                show-word-limit/>
             </template>
           </el-table-column>
           <el-table-column
@@ -843,8 +828,7 @@
                 placeholder="单价"
                 :disabled="browseStatus || scope.row.fSrcTypeId !== 0 || scope.row.fBillstatus == 6"
                 @change="changeContractAmt(scope.row)"
-                show-word-limit
-              />
+                show-word-limit/>
             </template>
           </el-table-column>
           <el-table-column
@@ -852,16 +836,14 @@
             header-align="center"
             align="center"
             width="130px"
-            label="金额"
-          >
+            label="金额">
             <template slot-scope="scope">
               <el-input
                 disabled
                 oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
                 v-model="scope.row.fAmount"
                 placeholder="金额"
-                show-word-limit
-              />
+                show-word-limit/>
             </template>
           </el-table-column>
           <el-table-column
@@ -869,14 +851,12 @@
             header-align="center"
             align="center"
             width="130px"
-            label="结算方式"
-          >
+            label="结算方式">
             <template slot-scope="scope">
               <el-select
                 v-model="scope.row.fStltypeid"
                 placeholder="请选择结算表票结、月结"
-                :disabled="browseStatus || scope.row.fBillstatus == 6"
-              >
+                :disabled="browseStatus || scope.row.fBillstatus == 6">
                 <el-option
                   v-for="(item, index) in fStltypeOptions"
                   :key="index.dictValue"
@@ -891,15 +871,13 @@
             header-align="center"
             align="center"
             width="130px"
-            label="币别"
-          >
+            label="币别">
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.fCurrency"
                 :disabled="browseStatus || scope.row.fBillstatus == 6"
                 placeholder="币别"
-                show-word-limit
-              />
+                show-word-limit/>
             </template>
           </el-table-column>
           <el-table-column
@@ -907,15 +885,13 @@
             header-align="center"
             align="center"
             width="130px"
-            label="汇率"
-          >
+            label="汇率">
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.fExrate"
                 :disabled="browseStatus || scope.row.fBillstatus == 6"
                 placeholder="汇率"
-                show-word-limit
-              />
+                show-word-limit/>
             </template>
           </el-table-column>
           <el-table-column
@@ -923,15 +899,13 @@
             header-align="center"
             align="center"
             width="130px"
-            label="税率"
-          >
+            label="税率">
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.fTaxrate"
                 :disabled="browseStatus || scope.row.fBillstatus == 6"
                 placeholder="税率"
-                show-word-limit
-              />
+                show-word-limit/>
             </template>
           </el-table-column>
           <el-table-column
@@ -939,15 +913,13 @@
             header-align="center"
             align="center"
             width="130px"
-            label="提单号"
-          >
+            label="提单号">
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.fMblno"
                 :disabled="browseStatus || scope.row.fBillstatus == 6"
                 placeholder="提单号"
-                show-word-limit
-              />
+                show-word-limit/>
             </template>
           </el-table-column>
           <el-table-column
@@ -955,15 +927,13 @@
             header-align="center"
             align="center"
             width="140px"
-            label="品名"
-          >
+            label="品名">
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.fProductName"
                 :disabled="browseStatus || scope.row.fBillstatus == 6"
                 placeholder="品名"
-                show-word-limit
-              />
+                show-word-limit/>
             </template>
           </el-table-column>
           <el-table-column
@@ -971,15 +941,13 @@
             header-align="center"
             align="center"
             width="130px"
-            label="品牌"
-          >
+            label="品牌">
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.fMarks"
                 :disabled="browseStatus || scope.row.fBillstatus == 6"
                 placeholder="品牌"
-                show-word-limit
-              />
+                show-word-limit/>
             </template>
           </el-table-column>
           <el-table-column
@@ -987,29 +955,25 @@
             header-align="center"
             align="center"
             width="130px"
-            label="来源"
-          >
+            label="来源">
             <template slot-scope="scope">
               <span v-if="scope.row.fSrcTypeId === 0">录入</span>
               <span v-if="scope.row.fSrcTypeId == 1">协议</span>
               <span v-if="scope.row.fSrcTypeId == 10">变更</span>
             </template>
           </el-table-column>
-
           <el-table-column
             prop="remark"
             header-align="center"
             align="center"
             width="150px"
-            label="备注"
-          >
+            label="备注">
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.remark"
                 :disabled="browseStatus || scope.row.fBillstatus == 6"
                 placeholder="备注"
-                show-word-limit
-              />
+                show-word-limit/>
             </template>
           </el-table-column>
           <el-table-column
@@ -1017,15 +981,13 @@
             align="center"
             label="操作"
             width="200px"
-            fixed="right"
-          >
+            fixed="right">
             <template slot-scope="scope">
               <el-button
                 @click.native.prevent="deleteRow(scope.$index, warehouseDrList)"
                 size="small"
                 :disabled="browseStatus || scope.row.fBillstatus == 6"
-                >移除</el-button
-              >
+                >移除</el-button>
               <el-button
                 size="small"
                 @click="listCheck(scope.row)"
@@ -1042,13 +1004,10 @@
           </el-table-column>
         </el-table>
       </el-collapse-item>
-
       <el-collapse-item>
         <template slot="title">
           <i class="el-icon-remove" style="font-size: 16px"></i>
-          <span style="font-size: 16px; font-weight: bolder; margin-left: 5px"
-            >付款信息</span
-          >
+          <span style="font-size: 16px; font-weight: bolder; margin-left: 5px">付款信息</span>
         </template>
         <div
           class="dialogTableTitle flex a-center jlr"
@@ -1057,37 +1016,32 @@
             justify-content: space-between;
             align-items: center;
             margin: 10px 0;
-          "
-        >
+          ">
           <div>
             <el-button
               type="primary"
               :disabled="browseStatus"
               @click.prevent="addpayment()"
-              size="small"
-              >新行
+              size="small">新行
             </el-button>
             <el-button
               type="primary"
               size="small"
               @click="saveForm"
               :disabled="browseStatus"
-              >保 存</el-button
-            >
+              >保 存</el-button>
             <el-button
               type="danger"
               size="small"
               @click.prevent="handleSelect(1)"
-              >作业费协议</el-button
-            >
+              >作业费协议</el-button>
             <el-button
               type="info"
               size="small"
               @click.prevent="printCr"
               v-if="isShowInvoice == 0"
             >请款单
-            </el-button
-            >
+            </el-button>
             <el-button
               size="small"
               type="primary"
@@ -1099,9 +1053,7 @@
               size="small"
               v-if="browseStatus"
               @click="feeChange('C')"
-            >
-              费用变更
-            </el-button>
+            >费用变更</el-button>
           </div>
         </div>
         <el-table
@@ -1112,31 +1064,27 @@
           stripe
           show-summary
           :summary-method="warehouseDrSummaries"
-          @selection-change="SelectCr"
-        >
+          @selection-change="SelectCr">
           <el-table-column type="selection" width="50" align="center" fixed />
           <el-table-column
             label="序号"
             type="index"
             width="50"
             fixed
-            align="center"
-          />
+            align="center"/>
           <el-table-column
             prop="fCorpid"
             header-align="center"
             align="center"
             width="300px"
-            label="客户名称"
-          >
+            label="客户名称">
             <template slot-scope="scope">
               <el-select
                 v-model="scope.row.fCorpid"
                 filterable
                 clearable
                 placeholder="客户名称"
-                :disabled="browseStatus || scope.row.fBillstatus == 6"
-              >
+                :disabled="browseStatus || scope.row.fBillstatus == 6">
                 <el-option
                   v-for="(item, index) in fMblnoOptions"
                   :key="index.fId"
@@ -1151,16 +1099,14 @@
             header-align="center"
             align="center"
             width="240px"
-            label="费用名称"
-          >
+            label="费用名称">
             <template slot-scope="scope">
               <el-select
                 v-model="scope.row.fFeeid"
                 clearable
                 filterable
                 placeholder="费用名称"
-                :disabled="browseStatus || scope.row.fBillstatus == 6"
-              >
+                :disabled="browseStatus || scope.row.fBillstatus == 6">
                 <el-option
                   v-for="(item, index) in fCNameOptions"
                   :key="index.fId"
@@ -1175,15 +1121,13 @@
             header-align="center"
             align="center"
             width="180px"
-            label="作业类型"
-          >
+            label="作业类型">
             <template slot-scope="scope">
               <el-select
                 style="width: 80%"
                 v-model="scope.row.fBusinessType"
                 filterable
-                disabled
-              >
+                disabled>
                 <el-option
                   v-for="(item, index) in businessTypeOption"
                   :key="index.dictValue"
@@ -1193,28 +1137,24 @@
               </el-select>
             </template>
           </el-table-column>
-
           <el-table-column
             prop="fFeeUnitid"
             header-align="center"
             align="center"
             width="180px"
-            label="计价单位"
-          >
+            label="计价单位">
             <template slot-scope="scope">
               <el-select
                 v-model="scope.row.fFeeUnitid"
                 placeholder="请选择计价单位"
                 clearable
                 :disabled="browseStatus || scope.row.fBillstatus == 6"
-                @change="changeFeeUnit(scope.row)"
-              >
+                @change="changeFeeUnit(scope.row)">
                 <el-option
                   v-for="(item, index) in fFeetUnitOptions"
                   :key="index.dictValue"
                   :label="item.dictLabel"
-                  :value="item.dictValue"
-                />
+                  :value="item.dictValue"/>
               </el-select>
             </template>
           </el-table-column>
@@ -1223,8 +1163,7 @@
             header-align="center"
             align="center"
             width="150px"
-            label="数量"
-          >
+            label="数量">
             <template slot-scope="scope">
               <el-input
                 oninput='this.value=this.value.replace(/[^0-9.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d).*$/,"$1$2.$3")'
@@ -1232,8 +1171,7 @@
                 :disabled="browseStatus || scope.row.fBillstatus == 6"
                 @change="changeContractAmt(scope.row)"
                 placeholder="数量"
-                show-word-limit
-              />
+                show-word-limit/>
             </template>
           </el-table-column>
           <el-table-column
@@ -1241,8 +1179,7 @@
             header-align="center"
             align="center"
             width="150px"
-            label="单价"
-          >
+            label="单价">
             <template slot-scope="scope">
               <el-input
                 oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
@@ -1250,8 +1187,7 @@
                 :disabled="browseStatus || scope.row.fSrcTypeId !== 0 || scope.row.fBillstatus == 6"
                 @change="changeContractAmt(scope.row)"
                 placeholder="单价"
-                show-word-limit
-              />
+                show-word-limit/>
             </template>
           </el-table-column>
           <el-table-column
@@ -1259,16 +1195,14 @@
             header-align="center"
             align="center"
             width="150px"
-            label="金额"
-          >
+            label="金额">
             <template slot-scope="scope">
               <el-input
                 disabled
                 oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
                 v-model="scope.row.fAmount"
                 placeholder="金额"
-                show-word-limit
-              />
+                show-word-limit/>
             </template>
           </el-table-column>
           <el-table-column
@@ -1276,14 +1210,12 @@
             header-align="center"
             align="center"
             width="130px"
-            label="结算方式"
-          >
+            label="结算方式">
             <template slot-scope="scope">
               <el-select
                 v-model="scope.row.fStltypeid"
                 placeholder="请选择结算表票结、月结"
-                :disabled="browseStatus || scope.row.fBillstatus == 6"
-              >
+                :disabled="browseStatus || scope.row.fBillstatus == 6">
                 <el-option
                   v-for="(item, index) in fStltypeOptions"
                   :key="index.dictValue"
@@ -1293,21 +1225,18 @@
               </el-select>
             </template>
           </el-table-column>
-
           <el-table-column
             prop="fCurrency"
             header-align="center"
             align="center"
             width="150px"
-            label="币别"
-          >
+            label="币别">
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.fCurrency"
                 :disabled="browseStatus || scope.row.fBillstatus == 6"
                 placeholder="币别"
-                show-word-limit
-              />
+                show-word-limit/>
             </template>
           </el-table-column>
           <el-table-column
@@ -1315,15 +1244,13 @@
             header-align="center"
             align="center"
             width="150px"
-            label="汇率"
-          >
+            label="汇率">
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.fExrate"
                 :disabled="browseStatus || scope.row.fBillstatus == 6"
                 placeholder="汇率"
-                show-word-limit
-              />
+                show-word-limit/>
             </template>
           </el-table-column>
           <el-table-column
@@ -1331,25 +1258,21 @@
             header-align="center"
             align="center"
             width="150px"
-            label="税率"
-          >
+            label="税率">
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.fTaxrate"
                 :disabled="browseStatus || scope.row.fBillstatus == 6"
                 placeholder="税率"
-                show-word-limit
-              />
+                show-word-limit/>
             </template>
           </el-table-column>
-
           <el-table-column
             prop="fMblno"
             header-align="center"
             align="center"
             width="130px"
-            label="提单号"
-          >
+            label="提单号">
             <template slot-scope="scope">
               <el-input
                 v-model="scope.row.fMblno"
@@ -2269,6 +2192,7 @@ export default {
       fCompanyOptIons: [],
       fleetOptions: [],
       fFeetUnitOptions: [],
+      battributionList: [],
       current: "",
       before: "",
       contrOl: false,
@@ -2735,6 +2659,9 @@ export default {
     listCorps({ fTypeid: 2 }).then((response) => {
       this.fleetOptions = response.rows;
     });
+    listCorps({fTypeid: 7}).then((response) => {
+      this.battributionList = response.rows;
+    });
     this.getDicts("unload_mode").then((response) => {
       this.unloadModes = response.data;
     });

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -545,8 +545,8 @@
                     <el-option
                       v-for="(item, index) in fMblnoOptions"
                       :key="index.fId"
-                      :label="item.fName"
-                      :value="item.fName"
+                      :label="item.fCname"
+                      :value="item.fCname"
                     ></el-option>
                   </el-select>
                 </el-form-item>
@@ -560,10 +560,9 @@
                     placeholder="请输入关键词"
                     style="width: 80%"
                     @change="changePrint"
-                    :disabled="browseStatus || form.warehouseStatus > 3"
                   >
                     <el-option
-                      v-for="(item, index) in fMblnoOptions"
+                      v-for="(item, index) in battributionList"
                       :key="index.fId"
                       :label="item.fName"
                       :value="item.fId"
@@ -2184,7 +2183,7 @@
                 {{ item.fGrossweight }}
               </td>
               <td v-else></td>
-              <td>{{ item.fPlanqty }}</td>
+              <td>{{ item.fQty }}</td>
               <td v-if="item.fNetweight && radio == 1">
                 {{ (item.fNetweight / 1000).toFixed(4) }}
               </td>
@@ -5593,7 +5592,7 @@
     >
       <el-radio v-model="radio" :label="1">吨（T）</el-radio>
       <el-radio v-model="radio" :label="2">千克（KG）</el-radio>
-      <div id="print_area9" class="print-div">
+      <div id="print_area99" class="print-div">
         <div
             class="print-title"
             style="
@@ -5612,7 +5611,7 @@
               <td>货物名称</td>
               <td colspan="2">{{ form.goodName }}</td>
               <td>库位</td>
-              <td colspan="2">{{ form.fWarehouseInformation }}</td>
+              <td colspan="2">{{ stockName }}</td>
             </tr>
             <tr>
               <td>提单号</td>
@@ -5764,7 +5763,7 @@
             </tr>
             <tr>
               <td>备注：</td>
-              <td colspan="5">{{ form.remark }}</td>
+              <td colspan="5">{{ item.remark }}</td>
             </tr>
           </table>
         </div>
@@ -7282,7 +7281,7 @@ export default {
               e.fStltypeid ? e.fStltypeid.toString() : null
           );
           // 选完客户带入发货方
-          this.$set(this.form, 'fShipper', e.fName)
+          this.$set(this.form, 'fShipper', e.fCname)
         }
       });
     },
@@ -9142,7 +9141,7 @@ export default {
           break
         case 'fxdkrkd':
           print({
-            printable: "print_area9",
+            printable: "print_area99",
             type: "html",
             style: style, // 亦可使用引入的外部css;
             scanStyles: false,

src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -441,10 +441,9 @@
                   placeholder="请输入关键词"
                   style="width: 80%"
                   @change="changePrint"
-                  :disabled="browseStatus || form.warehouseStatus > 3"
                 >
                   <el-option
-                    v-for="(item, index) in fMblnoOptions"
+                    v-for="(item, index) in battributionList"
                     :key="index.fId"
                     :label="item.fName"
                     :value="item.fId"
@@ -4778,6 +4777,7 @@ export default {
         fTel: '',
         fTax: '',
       },
+      battributionList: [],
     };
   },
   computed: {
@@ -4881,6 +4881,9 @@ export default {
     listCorps({fTypeid: 2}).then((response) => {
       this.fleetOptions = response.rows;
     });
+    listCorps({fTypeid: 7}).then((response) => {
+      this.battributionList = response.rows;
+    });
     this.getDicts("unload_mode").then((response) => {
       this.unloadModes = response.data;
     });

src/views/Warehousing/stockTransfer/AddOrUpdate.vue

@@ -484,10 +484,9 @@
                   placeholder="请输入关键词"
                   style="width: 80%"
                   @change="changePrint"
-                  :disabled="browseStatus || form.warehouseStatus > 3"
                 >
                   <el-option
-                    v-for="(item, index) in fMblnoOptions"
+                    v-for="(item, index) in battributionList"
                     :key="index.fId"
                     :label="item.fName"
                     :value="item.fId"
@@ -2651,7 +2650,7 @@
                 {{ item.fGrossweight }}
               </td>
               <td v-else></td>
-              <td>{{ item.fPlanqty }}</td>
+              <td>{{ item.fQty }}</td>
               <td v-if="item.fNetweight && radio == 1">
                 {{ (item.fNetweight / 1000).toFixed(4) }}
               </td>
@@ -4191,6 +4190,7 @@ export default {
         fTel: '',
         fTax: '',
       },
+      battributionList: [],
     };
   },
   created() {
@@ -4271,6 +4271,9 @@ export default {
     listCorps({ fTypeid: 2 }).then((response) => {
       this.fleetOptions = response.rows;
     });
+    listCorps({fTypeid: 7}).then((response) => {
+      this.battributionList = response.rows;
+    });
     this.getConfigKey("outStock.orders.approvalFlow").then((response) => {
       this.showApproval = response.msg;
     });

src/views/basicdata/corps/index.vue

@@ -1296,6 +1296,7 @@ export default {
             .replace(/\"/g, "")
             .split(",");
         }
+        this.relevantAttachments = response.data["attach"]? response.data["attach"]: [];
         this.form = response.data["corp"];
         console.log(this.form);
         var contactList1 = response.data["customerContact"];

src/views/basicdata/dept/index.vue

@@ -145,7 +145,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="仓库名称" prop="fName">
-              <el-input v-model="form.fName" placeholder="请输入仓库名称" />
+              <el-input v-model="form.fName" placeholder="请输入仓库名称" @change="nameChange"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -224,6 +224,14 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="简称" prop="fCname">
+              <el-input
+                v-model="form.fCname"
+                placeholder="请输入简称"
+              ></el-input>
+            </el-form-item>
+          </el-col>
         </el-row>
 
         <!--<el-form-item label="状态，默认 T ,正常T 停用F 下拉选择">
@@ -238,6 +246,10 @@
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>
       </el-form>
+      <up-load
+        :relevantAttachments="relevantAttachments"
+        :createBy="username"
+      ></up-load>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
@@ -251,6 +263,8 @@ import { listDept, getDept, delDept, addDept, updateDept, listDeptExcludeChild,
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import Vue from 'vue'
+import upLoad from "@/views/Warehousing/components/upLoad";
+import Cookies from "js-cookie";
 
 Vue.directive('dialogDrag', {
   bind(el, binding, vnode, oldVnode) {
@@ -308,7 +322,10 @@ Vue.directive('dialogDrag', {
 })
 export default {
   name: "Dept",
-  components: { Treeselect },
+  components: {
+    Treeselect,
+    upLoad,
+  },
   data() {
     return {
       //全屏放大
@@ -354,6 +371,9 @@ export default {
         fName: [
           { required: true, message: "仓库名称不能为空", trigger: "blur" }
         ],
+        fCname: [
+          { required: true, message: " ", trigger: "blur" }
+        ],
         orderNum: [
           { required: true, message: "显示排序不能为空", trigger: "blur" }
         ],
@@ -364,7 +384,9 @@ export default {
             trigger: "blur"
           }
         ]
-      }
+      },
+      relevantAttachments: [],
+      username:null,
     };
   },
   created() {
@@ -372,6 +394,7 @@ export default {
     this.getDicts("sys_normal_disable").then(response => {
       this.statusOptions = response.data;
     });
+    this.username = Cookies.get("userName");
   },
   methods: {
     //全屏放大
@@ -428,6 +451,7 @@ export default {
         status: "0",
         fLocation:'0'
       };
+      this.relevantAttachments = []
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -460,6 +484,7 @@ export default {
         this.form = response.data;
         this.form.fLocation = this.form.fLocation + ''
         this.form.fCharg = this.form.fCharg + ''
+        this.relevantAttachments = this.form.annexList? this.form.annexList: [];
         this.open = true;
         this.title = "修改仓库";
       });
@@ -472,12 +497,15 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.fId != undefined) {
+            console.log(this.relevantAttachments)
+            this.form.annexList = this.relevantAttachments
             updateDept(this.form).then(response => {
               this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
+            this.form.annexList = this.relevantAttachments
             addDept(this.form).then(response => {
               this.msgSuccess("新增成功");
               this.open = false;
@@ -500,7 +528,10 @@ export default {
           location.reload();
           this.msgSuccess("删除成功");
         })
-    }
+    },
+    nameChange() {
+      this.$set(this.form, 'fCname', this.form.fName)
+    },
   }
 };
 </script>

src/views/finance/otherFinancial/index.vue

@@ -0,0 +1,1213 @@
+<template>
+  <div class="app-container">
+    <div v-show="jiGang == false">
+      <el-form
+        :model="query"
+        ref="queryForm"
+        v-show="showSearch"
+        :inline="true"
+        label-width="88px"
+      >
+        <el-row>
+          <el-form-item label="参考编号" prop="fMblno">
+            <el-input
+              v-model="query.fMblno"
+              placeholder="请输入参考编号"
+              clearable
+              size="small"
+            />
+          </el-form-item>
+          <el-form-item label="客户名称" prop="fCorpid">
+            <el-select
+                v-model="query.fCorpid"
+                filterable
+                remote
+                placeholder="客户名称"
+            >
+              <el-option
+                  v-for="(dict, index) in KHblnoOptions"
+                  :key="index.fId"
+                  :label="dict.fName"
+                  :value="dict.fId"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item>
+            <el-button
+              type="cyan"
+              icon="el-icon-search"
+              size="mini"
+              @click="getList"
+            >搜索
+            </el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置
+            </el-button>
+          </el-form-item>
+        </el-row>
+      </el-form>
+      <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
+          <el-button
+            type="primary"
+            icon="el-icon-plus"
+            size="mini"
+            @click="handleAdd()"
+            v-hasPermi="['warehouseBusiness:containerPort:add']"
+          >新增
+          </el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="success"
+            icon="el-icon-edit"
+            size="mini"
+            :disabled="single"
+            @click="handleUpdate"
+            v-hasPermi="['agreement:agreementTask: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="['agreement:agreementTask:remove']"-->
+        <!--        >删除-->
+        <!--        </el-button>-->
+        <!--      </el-col>-->
+        <!--    <el-col :span="1.5">-->
+        <!--      <el-button-->
+        <!--        type="info"-->
+        <!--        icon="el-icon-download"-->
+        <!--        size="mini"-->
+        <!--        :disabled="single"-->
+        <!--        @click="handleUpdate(null, 2)"-->
+        <!--        v-hasPermi="['agreement:agreementStorage:export']"-->
+        <!--      >复制新增-->
+        <!--      </el-button>-->
+        <!--    </el-col>-->
+        <right-toolbar
+          :showSearch.sync="showSearch"
+          @queryTable="getList"
+        ></right-toolbar>
+      </el-row>
+      <el-table
+        v-loading="loading"
+        :data="agreementList"
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="55" align="center"/>
+        <el-table-column type="index" label="行号" align="center" fixed width="60"/>
+        <el-table-column
+            label="参考编号"
+            sortable
+            align="center"
+            prop="fMblno"
+            fixed
+            show-overflow-tooltip
+        />
+        <el-table-column
+            label="船名"
+            sortable
+            align="center"
+            prop="fVslid"
+            fixed
+            show-overflow-tooltip
+        />
+        <el-table-column
+            label="航次"
+            sortable
+            align="center"
+            prop="fVoyid"
+            fixed
+            show-overflow-tooltip
+        />
+        <el-table-column
+            label="单据类型"
+            sortable
+            align="center"
+            prop="fBilltype"
+            fixed
+            show-overflow-tooltip
+        />
+        <el-table-column
+            label="单据编号"
+            sortable
+            align="center"
+            prop="fBillno"
+            fixed
+            show-overflow-tooltip
+        />
+        <el-table-column
+          label="单据日期"
+          sortable
+          align="center"
+          prop="fBsdate"
+          fixed
+          show-overflow-tooltip
+        />
+        <el-table-column
+          label="制单人"
+          sortable
+          align="center"
+          prop="createBy"
+          fixed
+          show-overflow-tooltip
+        />
+        <el-table-column
+          label="备注"
+          sortable
+          align="center"
+          prop="remark"
+          fixed
+          show-overflow-tooltip
+        />
+        <el-table-column
+          label="操作"
+          align="center"
+          fixed="right"
+          width="180"
+          class-name="small-padding fixed-width"
+        >
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-view"
+              @click="handleUpdate(scope.row)"
+            >查看
+            </el-button>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="handleUpdate(scope.row)"
+              v-if="scope.row.fBillstatus === '暂存'"
+              v-hasPermi="['warehouseBusiness:containerPort:edit']"
+            >修改
+            </el-button>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleDelete(scope.row)"
+              v-if="scope.row.fBillstatus === '暂存'"
+              v-hasPermi="['warehouseBusiness:containerPort:remove']"
+            >删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div style="padding-top: 10px;float: right;padding-bottom: 20px">
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :page-sizes="[10, 20, 30, 40]"
+          background
+          layout="sizes, prev, pager, next"
+          :total="total">
+        </el-pagination>
+      </div>
+    </div>
+    <div v-show="jiGang == true">
+      <div style="margin-bottom: 20px;">
+        <el-button round icon="el-icon-arrow-left" @click="open" size="small">返回列表</el-button>
+        <el-button type="primary" round size="small" @click="submitForm" icon="el-icon-edit">保 存</el-button>
+        <el-button type="success" round size="small" @click="submit" icon="el-icon-check" :disabled="disabled">提 交</el-button>
+        <el-button type="danger" round size="small" icon="el-icon-close" @click="cancellation"
+                   v-if="queryParams.fBillstatus >2">撤销提交
+        </el-button>
+      </div>
+      <el-form
+        :model="queryParams"
+        ref="rules"
+        :rules="rules"
+        :inline="true"
+        label-width="88px"
+      >
+        <el-row>
+          <el-form-item label="日期" prop="fBsdate">
+            <el-date-picker
+              v-model="queryParams.fBsdate"
+              type="date"
+              style="width: 200px;"
+              value-format="yyyy-MM-dd"
+              :disabled="disabled"
+              clearable
+              size="small"
+              placeholder="选择日期"
+            >
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="参考编号" prop="fMblno">
+            <el-input
+              v-model="queryParams.fMblno"
+              placeholder="请输入参考编号"
+              style="width: 200px;"
+              :disabled="disabled"
+              clearable
+              size="small"
+            />
+          </el-form-item>
+          <el-form-item label="单据编号" prop="fBillno">
+            <el-input
+              v-model="queryParams.fBillno"
+              placeholder="请输入单据编号"
+              style="width: 200px;"
+              disabled
+              clearable
+              size="small"
+            />
+          </el-form-item>
+          <el-form-item label="船名">
+            <template slot-scope="scope">
+              <el-select
+                  v-model="queryParams.fVslid"
+                  style="width: 200px;"
+                  size="small"
+                  placeholder="请选择船名"
+                  filterable
+              >
+                <el-option
+                    v-for="item in TVesselfs"
+                    :key="item.fId"
+                    :label="item.fName"
+                    :value="item.fId"
+                />
+              </el-select>
+            </template>
+          </el-form-item>
+          <el-form-item
+              prop="fVoyid"
+              header-align="center"
+              label="航次"
+          >
+            <template slot-scope="scope">
+              <el-select
+                  v-model="queryParams.fVoyid"
+                  size="small"
+                  style="width: 200px;"
+                  placeholder="请选择航次"
+                  filterable
+              >
+                <el-option
+                    v-for="item in TVoyagefs"
+                    :key="item.fId"
+                    :label="item.fNo"
+                    :value="item.fId"
+                />
+              </el-select>
+            </template>
+          </el-form-item>
+          <el-form-item label="备注" prop="remark">
+            <el-input
+                v-model="queryParams.remark"
+                placeholder="请输入备注"
+                :disabled="disabled"
+                style="width: 796px;"
+                clearable
+                size="small"
+            />
+          </el-form-item>
+        </el-row>
+      </el-form>
+
+      <h3><i class="el-icon-circle-plus"></i>收款信息</h3>
+      <div
+        class="dialogTableTitle flex a-center jlr"
+        style="
+              display: flex;
+              justify-content: space-between;
+              align-items: center;
+              margin: 10px 0;
+            "
+      >
+        <div>
+          <el-button
+            size="small"
+            type="primary"
+            @click.prevent="addCollection()"
+            :disabled="disabled"
+          >新行
+          </el-button>
+          <!-- <el-button :disabled="browseStatus" @click.prevent="deleteRow(warehouseDrList)"
+          >删除
+        </el-button> -->
+        </div>
+      </div>
+      <el-table
+        :data="warehouseDrList"
+        ref="table"
+        tooltip-effect="dark"
+        border
+        stripe
+        show-summary
+        :disabled="disabled"
+        :summary-method="warehouseDrSummaries"
+      >
+        <el-table-column type="selection" width="55" align="center"/>
+        <el-table-column label="序号" type="index" width="80">
+        </el-table-column>
+        <el-table-column
+          prop="fCorpid"
+          header-align="center"
+          align="center"
+          width="180px"
+          label="客户名称"
+        >
+          <template slot-scope="scope">
+            <el-select
+              v-model="scope.row.fCorpid"
+              filterable
+              remote
+              placeholder="客户名称"
+              :disabled="disabled"
+            >
+              <el-option
+                v-for="(dict, index) in KHblnoOptions"
+                :key="index.fId"
+                :label="dict.fName"
+                :value="dict.fId"
+              ></el-option>
+            </el-select>
+          </template>
+        </el-table-column>
+<!--        <el-table-column-->
+<!--          prop="fFeeunitid"-->
+<!--          header-align="center"-->
+<!--          align="center"-->
+<!--          width="180px"-->
+<!--          label="码头"-->
+<!--        >-->
+<!--          <template slot-scope="scope">-->
+<!--            <el-select-->
+<!--              style="width: 80%"-->
+<!--              v-model="scope.row.fFeeunitid"-->
+<!--              filterable-->
+<!--              :disabled="disabled"-->
+<!--            >-->
+<!--              <el-option-->
+<!--                v-for="(dict, index) in businessTypeOption"-->
+<!--                :key="index.dictValue"-->
+<!--                :label="dict.dictLabel"-->
+<!--                :value="dict.dictValue"-->
+<!--              ></el-option>-->
+<!--            </el-select>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+
+
+        <el-table-column
+          prop="fFeeid"
+          header-align="center"
+          align="center"
+          width="180px"
+          label="费用名称"
+        >
+          <template slot-scope="scope">
+            <el-select
+              style="width: 80%"
+              v-model="scope.row.fFeeid"
+              filterable
+              :disabled="disabled"
+            >
+              <el-option
+                v-for="(dict, index) in fDNameOptions"
+                :key="index.fId"
+                :label="dict.fName"
+                :value="dict.fId"
+              ></el-option>
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column
+            prop="fFeeUnitid"
+            header-align="center"
+            align="center"
+            width="180px"
+            label="计费单位"
+        >
+          <template slot-scope="scope">
+            <el-select
+                v-model="scope.row.fFeeunitid"
+                placeholder="请选择计费单位"
+                :disabled="disabled"
+                clearable
+            >
+              <el-option
+                  v-for="dict in fFeetUnitOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+              />
+            </el-select>
+          </template>
+        </el-table-column>
+<!--        <el-table-column-->
+<!--          prop="fInventoryDays"-->
+<!--          header-align="center"-->
+<!--          align="center"-->
+<!--          width="180px"-->
+<!--          label="箱型"-->
+<!--        >-->
+<!--          <template slot-scope="scope">-->
+<!--            <el-select-->
+<!--              v-model="scope.row.fInventoryDays"-->
+<!--              placeholder="请选择箱型"-->
+<!--              clearable-->
+<!--              :disabled="disabled"-->
+<!--            >-->
+<!--              <el-option-->
+<!--                v-for="(dict, index) in jFeetunitOptions"-->
+<!--                :key="index.fId"-->
+<!--                :label="dict.fNo"-->
+<!--                :value="dict.fId"-->
+<!--              />-->
+<!--            </el-select>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+        <el-table-column
+          prop="fQty"
+          header-align="center"
+          align="center"
+          width="130px"
+          label="数量"
+        >
+          <template slot-scope="scope">
+            <el-input
+              oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
+              v-model="scope.row.fQty"
+              placeholder="数量"
+              @input="calculation(scope.row)"
+              show-word-limit
+              :disabled="disabled"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="fUnitprice"
+          header-align="center"
+          align="center"
+          width="130px"
+          label="单价"
+        >
+          <template slot-scope="scope">
+            <el-input
+              oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
+              v-model="scope.row.fUnitprice"
+              placeholder="单价"
+              show-word-limit
+              @input="calculation(scope.row)"
+              :disabled="disabled"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="fAmt"
+          header-align="center"
+          align="center"
+          width="130px"
+          label="金额"
+        >
+          <template slot-scope="scope">
+            <el-input
+              :disabled="disabled"
+              oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
+              v-model="scope.row.fAmt"
+              placeholder="金额"
+              show-word-limit
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
+            prop="fCurrency"
+            header-align="center"
+            align="center"
+            width="130px"
+            label="币别"
+        >
+          <template slot-scope="scope">
+            <el-select
+                v-model="scope.row.fCurrency"
+                placeholder="请选择币别"
+                :disabled="disabled"
+                clearable
+            >
+              <el-option
+                  v-for="dict in currencyList"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+              />
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column
+            prop="fExrate"
+            header-align="center"
+            align="center"
+            width="130px"
+            label="汇率"
+        >
+          <template slot-scope="scope">
+            <el-input
+                v-model="scope.row.fExrate"
+                :disabled="disabled"
+                placeholder="汇率"
+                show-word-limit
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
+            prop="remark"
+            header-align="center"
+            align="center"
+            width="150px"
+            label="备注"
+        >
+          <template slot-scope="scope">
+            <el-input
+                v-model="scope.row.remark"
+                :disabled="browseStatus || scope.row.fBillstatus == 6"
+                placeholder="备注"
+                show-word-limit
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
+          header-align="center"
+          align="center"
+          label="操作"
+        >
+          <template slot-scope="scope">
+            <el-button
+              @click.native.prevent="
+                    deleteRow(scope.$index, warehouseDrList)
+                  "
+              size="small"
+              :disabled="disabled"
+            >移除
+            </el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <h3><i class="el-icon-remove"></i>付款信息</h3>
+      <div
+        class="dialogTableTitle flex a-center jlr"
+        style="
+              display: flex;
+              justify-content: space-between;
+              align-items: center;
+              margin: 10px 0;
+            "
+      >
+        <div>
+          <el-button
+            type="primary"
+            @click.prevent="addpayment()"
+            size="small"
+            :disabled="disabled"
+          >新行
+          </el-button>
+        </div>
+      </div>
+      <el-table
+        :data="warehouseCrList"
+        :disabled="disabled"
+        ref="table"
+        tooltip-effect="dark"
+        border
+        stripe
+        show-summary
+        :summary-method="warehouseDrSummaries"
+      >
+        <el-table-column type="selection" width="55" align="center"/>
+        <el-table-column label="序号" type="index" width="80">
+        </el-table-column>
+        <el-table-column
+            prop="fCorpid"
+            header-align="center"
+            align="center"
+            width="180px"
+            label="客户名称"
+        >
+          <template slot-scope="scope">
+            <el-select
+                v-model="scope.row.fCorpid"
+                filterable
+                remote
+                placeholder="客户名称"
+                :disabled="disabled"
+            >
+              <el-option
+                  v-for="(dict, index) in KHblnoOptions"
+                  :key="index.fId"
+                  :label="dict.fName"
+                  :value="dict.fId"
+              ></el-option>
+            </el-select>
+          </template>
+        </el-table-column>
+        <!--        <el-table-column-->
+        <!--          prop="fFeeunitid"-->
+        <!--          header-align="center"-->
+        <!--          align="center"-->
+        <!--          width="180px"-->
+        <!--          label="码头"-->
+        <!--        >-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <el-select-->
+        <!--              style="width: 80%"-->
+        <!--              v-model="scope.row.fFeeunitid"-->
+        <!--              filterable-->
+        <!--              :disabled="disabled"-->
+        <!--            >-->
+        <!--              <el-option-->
+        <!--                v-for="(dict, index) in businessTypeOption"-->
+        <!--                :key="index.dictValue"-->
+        <!--                :label="dict.dictLabel"-->
+        <!--                :value="dict.dictValue"-->
+        <!--              ></el-option>-->
+        <!--            </el-select>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+
+
+        <el-table-column
+            prop="fFeeid"
+            header-align="center"
+            align="center"
+            width="180px"
+            label="费用名称"
+        >
+          <template slot-scope="scope">
+            <el-select
+                style="width: 80%"
+                v-model="scope.row.fFeeid"
+                filterable
+                :disabled="disabled"
+            >
+              <el-option
+                  v-for="(dict, index) in fCNameOptions"
+                  :key="index.fId"
+                  :label="dict.fName"
+                  :value="dict.fId"
+              ></el-option>
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column
+            prop="fFeeUnitid"
+            header-align="center"
+            align="center"
+            width="180px"
+            label="计费单位"
+        >
+          <template slot-scope="scope">
+            <el-select
+                v-model="scope.row.fFeeunitid"
+                placeholder="请选择计费单位"
+                :disabled="disabled"
+                clearable
+            >
+              <el-option
+                  v-for="dict in fFeetUnitOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+              />
+            </el-select>
+          </template>
+        </el-table-column>
+        <!--        <el-table-column-->
+        <!--          prop="fInventoryDays"-->
+        <!--          header-align="center"-->
+        <!--          align="center"-->
+        <!--          width="180px"-->
+        <!--          label="箱型"-->
+        <!--        >-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <el-select-->
+        <!--              v-model="scope.row.fInventoryDays"-->
+        <!--              placeholder="请选择箱型"-->
+        <!--              clearable-->
+        <!--              :disabled="disabled"-->
+        <!--            >-->
+        <!--              <el-option-->
+        <!--                v-for="(dict, index) in jFeetunitOptions"-->
+        <!--                :key="index.fId"-->
+        <!--                :label="dict.fNo"-->
+        <!--                :value="dict.fId"-->
+        <!--              />-->
+        <!--            </el-select>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+                <el-table-column
+                  prop="fQty"
+                  header-align="center"
+                  align="center"
+                  width="130px"
+                  label="数量"
+                >
+                  <template slot-scope="scope">
+                    <el-input
+                      oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
+                      v-model="scope.row.fQty"
+                      placeholder="数量"
+                      @input="calculation(scope.row)"
+                      show-word-limit
+                      :disabled="disabled"
+                    />
+                  </template>
+                </el-table-column>
+        <el-table-column
+            prop="fUnitprice"
+            header-align="center"
+            align="center"
+            width="130px"
+            label="单价"
+        >
+          <template slot-scope="scope">
+            <el-input
+                oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
+                v-model="scope.row.fUnitprice"
+                placeholder="单价"
+                show-word-limit
+                @input="calculation(scope.row)"
+                :disabled="disabled"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
+            prop="fAmt"
+            header-align="center"
+            align="center"
+            width="130px"
+            label="金额"
+        >
+          <template slot-scope="scope">
+            <el-input
+                :disabled="disabled"
+                oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
+                v-model="scope.row.fAmt"
+                placeholder="金额"
+                show-word-limit
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
+            prop="fCurrency"
+            header-align="center"
+            align="center"
+            width="130px"
+            label="币别"
+        >
+          <template slot-scope="scope">
+            <el-select
+                v-model="scope.row.fCurrency"
+                placeholder="请选择币别"
+                :disabled="disabled"
+                clearable
+            >
+              <el-option
+                  v-for="dict in currencyList"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+              />
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column
+            prop="fExrate"
+            header-align="center"
+            align="center"
+            width="130px"
+            label="汇率"
+        >
+          <template slot-scope="scope">
+            <el-input
+                v-model="scope.row.fExrate"
+                :disabled="disabled"
+                placeholder="汇率"
+                show-word-limit
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
+            prop="remark"
+            header-align="center"
+            align="center"
+            width="150px"
+            label="备注"
+        >
+          <template slot-scope="scope">
+            <el-input
+                v-model="scope.row.remark"
+                :disabled="browseStatus || scope.row.fBillstatus == 6"
+                placeholder="备注"
+                show-word-limit
+            />
+          </template>
+        </el-table-column>
+        <el-table-column
+          header-align="center"
+          align="center"
+          label="操作"
+        >
+          <template slot-scope="scope">
+            <!-- <el-button size="small">审核费用</el-button> -->
+            <el-button
+              @click.native.prevent="
+                    deleteRow(scope.$index, warehouseCrList)
+                  "
+              size="small"
+              :disabled="disabled"
+            >移除
+            </el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+  </div>
+</template>
+
+<script>
+import {
+  listCorps,
+  preservation,
+  submit,
+  allInformation,
+  single,
+  singleDeletion,
+  listCorps_s,
+  revokeContainerPort
+} from '@/api/otherFinancial'
+import {listFees} from '@/api/basicdata/fees'
+import {selectTVesself, selectTVoyagef} from "@/api/finance/kaihe/payment";
+
+export default {
+  name: 'jiGang',
+  data() {
+    return {
+      rules:{
+        fBsdate:[{required: true, message: ' ', trigger: 'blur'}],
+        fMblno:[{required: true, message: ' ', trigger: 'blur'}]
+      },
+      showSearch: true,
+      jiGang: false,
+      disabled: false,
+      agreementList: [],
+      warehouseCrList: [],
+      fCNameOptions: [],
+      fFeeid_s: [],
+      fStltypeOptions: [],
+      jFeetunitOptions: [],
+      KHblnoOptions: [],
+      browseStatus: false,
+      fDNameOptions: [],
+      warehouseDrList: [],
+      businessTypeOption: [],
+      loading: true,
+      blnoOptions: [],
+      single: true,
+      total: 0,
+      query: {
+        pageNum: 1,
+        pageSize: 10
+      },
+      selection: [],
+      queryParams: {},
+      fFeetUnitOptions:[],
+      currencyList:[],
+      TVesselfs:[],
+      TVoyagefs:[]
+    }
+  },
+  created() {
+    selectTVesself().then((res) => {
+      this.TVesselfs = res.rows;
+    });
+    selectTVoyagef().then((res) => {
+      this.TVoyagefs = res.rows;
+    });
+    this.getDicts("currency_difference").then((response) => {
+      this.currencyList = response.data;
+    });
+    this.corpsRemoteMethod()
+    //付费
+    listFees({fDc: "C"}).then((response) => {
+      this.fCNameOptions = response.rows;
+    });
+    //收费
+    listFees({fDc: "D"}).then((response) => {
+      this.fDNameOptions = response.rows;
+    });
+    this.getDicts("data_unitfees").then((response) => {
+      this.fFeetUnitOptions = response.data;
+    });
+    allInformation().then(res => {
+      if (res.data.corpList) {
+        this.KHblnoOptions = res.data.corpList
+      }
+      if (res.data.pierList) {
+        this.businessTypeOption = res.data.pierList
+      }
+      if (res.data.cntrList) {
+        this.jFeetunitOptions = res.data.cntrList
+      }
+      if (res.data.fees) {
+        this.fFeeid_s = res.data.fees
+      }
+    })
+    this.getList()
+  },
+  methods: {
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`);
+      this.query.pageSize = val
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`);
+      this.query.pageNum = val
+      this.getList()
+    },
+    getList() {
+      listCorps_s(this.query).then(res => {
+        this.total = res.total
+        this.loading = false
+        this.agreementList = res.rows
+      })
+    },
+    corpsRemoteMethod(name) {
+      if (name == null || name === '') {
+        return false
+      }
+      let queryParams = {pageNum: 1, fName: name, fTypeid: 1}
+      listCorps(queryParams).then((response) => {
+        console.log(response)
+        this.fMblnoOptions = response.rows
+      })
+    },
+    corpsRemote(name) {
+      if (name == null || name === '') {
+        return false
+      }
+      let queryParams = {pageNum: 1, fName: name, fTypeid: 2}
+      listCorps(queryParams).then((response) => {
+        console.log(response)
+        this.blnoOptions = response.rows
+      })
+    },
+    changeFeeId(row) {
+      for (let li in this.fWbuOptions) {
+        if (row.fFeeid === this.fWbuOptions[li].fId) {
+          this.$set(row, 'fFeeunitid', this.fWbuOptions[li].fFeeunitid + '')
+          this.changeFeeUnit(row)
+          break
+        }
+      }
+    },
+    resetQuery() {
+      this.query = {
+        pageNum: 1,
+        pageSize: 10
+      }
+    },
+    open() {
+      this.$confirm('是否确定返回列表?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.jiGang = false
+      }).catch(() => {
+      })
+    },
+    handleSelectionChange(selection) {
+      console.log(selection)
+      this.selection = selection
+      if (selection.length === 1) {
+        this.single = false
+      } else {
+        this.single = true
+      }
+    },
+    handleUpdate(row) {
+      let fId
+      if (this.selection.length == 1) {
+        fId = this.selection[0].fId
+      } else {
+        fId = row.fId
+      }
+      single(fId).then(res => {
+        if (res.code === 200) {
+          this.jiGang = true
+          this.queryParams = res.data.warehouseBills
+          this.warehouseDrList = res.data.feesDrList
+          this.warehouseCrList = res.data.feesCrList
+          for (let item in this.warehouseDrList){
+            this.warehouseDrList[item].fFeeunitid = this.warehouseDrList[item].fFeeunitid + ''
+          }
+          for (let item in this.warehouseCrList){
+            this.warehouseCrList[item].fFeeunitid = this.warehouseCrList[item].fFeeunitid + ''
+          }
+          if (this.queryParams.fBillstatus !== 2) {
+            this.disabled = true
+          } else {
+            this.disabled = false
+          }
+        }
+      })
+    },
+    handleDelete(row) {
+      singleDeletion(row.fId).then(res => {
+        console.log(res)
+        if (res.code === 200){
+          this.$message.success(res.msg);
+          this.getList()
+        }
+      })
+    },
+    handleAdd() {
+      this.jiGang = true
+      this.disabled = false
+      this.queryParams = {}
+      this.warehouseDrList = []
+      this.warehouseCrList = []
+    },
+    addpayment() {
+      this.warehouseCrList.push({
+        fCorpid:'',
+        fFeeid:'',
+        fFeeUnitid:'',
+        fUnitprice:'',
+        fAmt:'',
+        fExrate:'',
+        remark:'',
+        fCurrency:'1'
+      })
+      this.fWbuOptions = []
+      let queryParams = {pageNum: 1, fDc: 'C'}
+      listFees(queryParams).then((response) => {
+        this.fCNameOptions = response.rows
+      })
+    },
+    deleteRow(index, rows) {
+      rows.splice(index, 1)
+    },
+    submitForm() {
+      this.$refs["rules"].validate((valid) => {
+        if (valid) {
+          let formDatae = new window.FormData()
+          formDatae.append('warehouseBills', JSON.stringify(this.queryParams))
+          formDatae.append('feesDr', JSON.stringify(this.warehouseDrList))
+          formDatae.append('feesCr', JSON.stringify(this.warehouseCrList))
+          preservation(formDatae).then(res => {
+            console.log(res)
+            if (res.code === 200) {
+              this.$message.success('保存成功');
+              this.getList()
+              this.jiGang = false
+            }
+          })
+        }
+      });
+    },
+    submit() {
+      this.$refs["rules"].validate((valid) => {
+        if (valid) {
+          let formDatae = new window.FormData()
+          formDatae.append('warehouseBills', JSON.stringify(this.queryParams))
+          formDatae.append('feesDr', JSON.stringify(this.warehouseDrList))
+          formDatae.append('feesCr', JSON.stringify(this.warehouseCrList))
+          submit(formDatae).then(res => {
+            console.log(res)
+            if (res.code === 200) {
+              this.$message.success('提交成功');
+              this.getList()
+              this.jiGang = false
+            }
+          })
+        }
+      });
+    },
+    cancellation() {
+      // let formDatae = new window.FormData()
+      // formDatae.append('warehouseBills', JSON.stringify(this.queryParams))
+      // formDatae.append('feesDr', JSON.stringify(this.warehouseDrList))
+      // formDatae.append('feesCr', JSON.stringify(this.warehouseCrList))
+      revokeContainerPort(this.queryParams.fId).then(res => {
+        console.log(res)
+        if (res.code === 200) {
+          this.$message.success('撤销成功');
+          this.getList()
+          this.jiGang = false
+        }
+      })
+    },
+    calculation(row) {
+      console.log(row)
+      if (row.fQty && row.fUnitprice) {
+        row.fAmt = Number(row.fQty) * Number(row.fUnitprice)
+      }
+    },
+    addCollection() {
+      this.warehouseDrList.push({
+        fCorpid:'',
+        fFeeid:'',
+        fFeeUnitid:'',
+        fUnitprice:'',
+        fAmt:'',
+        fExrate:'',
+        remark:'',
+        fCurrency:'1'
+      })
+      this.fWbuOptions = []
+      let queryParams = {pageNum: 1, fDc: 'D'}
+      listFees(queryParams).then((response) => {
+        this.fDNameOptions = response.rows
+      })
+    },
+    // 付款合计
+    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' ||
+          column.property === 'fAmt'
+        ) {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr)
+            if (!isNaN(value)) {
+              return prev + curr
+            } else {
+              return prev
+            }
+          }, 0)
+          sums[index] = sums[index].toFixed(2)
+        }
+      })
+      return sums
+    },
+  }
+}
+</script>
+
+<style scoped lang="scss">
+</style>

src/views/index.vue

@@ -839,13 +839,15 @@
         <div id="voyage" style="width: 100%;height: 350px;"></div>
       </div>
     </div>
-<!--    快捷入库-->
+    <div id="finance" v-if="wealthChart" style="width: 100%;height: 600px;"></div>
+    <div id="arrears" v-if="wealthChart" style="width: 100%;height: 600px;"></div>
+<!--快捷入库-->
     <fast-in-stock
       ref="fastInStock"
       v-if="fastInStockVisble"
       @closeDialog="closeInStock"
     ></fast-in-stock>
-<!--    快速出库-->
+<!--快速出库-->
     <fast-out-stock
       ref="fastOutStock"
       v-if="fastOutStockVisble"
@@ -867,13 +869,15 @@ import {
   bookingSpace,
   locationRanking,
   getProfitData,
-  remindExpirationData
+  remindExpirationData,
+  getFeeStatistics, getArrearsStatistics
 } from "../../src/api/index";
 import Cookies from "js-cookie";
 import fastInStock from '../../src/components/fastStorage/fastInStock/index'
 import fastOutStock from '../../src/components/fastStorage/fastOutStock/index'
 import {getToken} from "@/utils/auth";
 import {currentLogin} from "@/api/warehouseCheck";
+import { getUserProfile } from "@/api/system/user";
 
 export default {
   name: "index",
@@ -881,6 +885,7 @@ export default {
     return {
       fastInStockVisble: false,
       fastOutStockVisble: false,
+      wealthChart:false,
       bookingData:[],
       editModel: {},
       // 版本号
@@ -1048,11 +1053,23 @@ export default {
         this.oceanVessel()
       })
     }
+    getUserProfile().then(res=>{
+      for (let item in res.data.roles){
+        if (res.data.roles[item].roleKey == "wealthStatistics" || res.data.roles[item].roleKey =="admin"){
+          getFeeStatistics().then(res=>{
+            this.financeLine(res.data)
+          })
+          getArrearsStatistics().then(res=>{
+            this.customerArrears(res.data)
+          })
+          this.wealthChart = true
+        }
+      }
+    })
   },
   methods: {
     // 船名航次
     oceanVessel() {
-      console.log(this.profitData.xData)
       let myChart = this.$echarts.init(document.getElementById("voyage"));
       const color = ['#EE6666', '#7DD2F3']
       myChart.setOption({
@@ -1523,6 +1540,116 @@ export default {
     goTarget(href) {
       window.open(href, "_blank");
     },
+    //财务图表
+    financeLine(data) {
+      // 基于准备好的dom，初始化echarts实例，所以只能在mounted中调用
+      let myChart = this.$echarts.init(document.getElementById("finance"));
+      // 绘制图表
+      myChart.setOption({
+        legend: {
+          left: '10%',
+          top: '4%'
+        },
+        title: {
+          text: "利润分析",
+          left: "center",
+          subtext: "实时数据"
+        },
+        tooltip: {},
+        color: ["#5470c6","#92cc75","#fac858"],
+        dataset: data,
+        xAxis: { type: 'category' },
+        yAxis: [
+          {
+            type: 'value',
+            scale: true,
+            axisLabel: {
+              formatter: '{value} 万元'
+            }
+          }
+        ],
+        grid: {
+          left: "3%",
+          right: "4%",
+          bottom: "3%",
+          containLabel: true,
+        },
+        // Declare several bar series, each will be mapped
+        // to a column of dataset.source by default.
+        series: [{ type: 'bar',
+          label: {
+            show: true,
+            position: 'top',
+            valueAnimation: true
+          }}, { type: 'bar',
+          label: {
+            show: true,
+            position: 'top',
+            valueAnimation: true
+          }}, { type: 'bar',
+          label: {
+            show: true,
+            position: 'top',
+            valueAnimation: true
+          }}]
+      });
+    },
+    customerArrears(data){
+      // 基于准备好的dom，初始化echarts实例，所以只能在mounted中调用
+      let myChart = this.$echarts.init(document.getElementById("arrears"));
+      // 绘制图表
+      myChart.setOption({
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'shadow'
+          }
+        },
+        title: {
+          text: "欠款排行",
+          left: "center",
+          subtext: "实时数据"
+        },
+        color: ["#3298db"],
+        grid: {
+          left: '3%',
+          right: '4%',
+          bottom: '3%',
+          containLabel: true
+        },
+        xAxis: [
+          {
+            type: 'category',
+            data: data.key,
+            axisTick: {
+              alignWithLabel: true
+            }
+          }
+        ],
+        yAxis: [
+          {
+            type: 'value',
+            scale: true,
+            axisLabel: {
+              formatter: '{value} 万元'
+            }
+          }
+        ],
+        series: [
+          {
+            name: '欠款',
+            type: 'bar',
+            barWidth: '60%',
+            data: data.value,
+            label: {
+              show: true,
+              position: 'top',
+              valueAnimation: true
+            }
+          }
+        ]
+      })
+    },
     //仓库图表
     drawLine() {
       // 基于准备好的dom，初始化echarts实例，所以只能在mounted中调用
@@ -1735,7 +1862,7 @@ export default {
         ],
         yAxis: [
           {
-            type: "value",
+            type: "value"
           },
         ],
         series: [
@@ -1744,6 +1871,11 @@ export default {
             type: "bar",
             barWidth: "60%",
             data: this.commoditytwo,
+            label: {
+              show: true,
+              position: 'top',
+              valueAnimation: true
+            }
           },
         ],
       });

src/views/login.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">途宝智慧云仓平台</h3>
+      <h3 class="title">智慧云仓平台</h3>
 <!--      靖润-->
 <!--      <h3 class="title" style="font-family: '微软雅黑 Light'; color: #265EE4">靖润科技陆运平台</h3>-->
 
@@ -20,7 +20,6 @@
           @keyup.enter.native="handleLogin"
         >
 <!--          <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />-->
-
           <i slot="prefix" class="el-icon-lock" style="font-size: 20px;padding-top: 11px;padding-left: 2px;color: #565656;"></i>
         </el-input>
       </el-form-item>

src/views/reportManagement/whgenleg/index.vue

@@ -5,7 +5,7 @@
       ref="queryForm"
       :inline="true"
       v-show="showSearch"
-      label-width="68px"
+      label-width="76px"
     >
       <el-form-item label="客户" prop="fCorpid">
         <el-select
@@ -149,7 +149,7 @@
             size="small"
         />
       </el-form-item>
-      <el-form-item label="显示库存" prop="isMblno">
+      <el-form-item label="显示0库存" prop="isMblno">
         <el-select
           v-model="queryParams.isMblno"
           filterable

src/views/system/user/index.vue

@@ -455,9 +455,6 @@ export default {
         deptId: [
           { required: true, message: "归属部门不能为空", trigger: "change" }
         ],
-        password: [
-          { required: true, message: "用户密码不能为空", trigger: "blur" }
-        ],
         email: [
           { required: true, message: "邮箱地址不能为空", trigger: "blur" },
           {
@@ -637,8 +634,8 @@ export default {
     submitForm: function() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          if(!this.form.password) delete this.form.password
           if (this.form.userId != undefined) {
-            console.log(this.form)
             updateUser(this.form).then(response => {
               this.msgSuccess("修改成功");
               this.open = false;

src/views/warehouseBusiness/warehouseCheck/index.vue

@@ -101,33 +101,33 @@
               :height="tableHeight">
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="序号" type="index" width="50" fixed align="center"/>
-      <el-table-column label="仓库名称" align="center" prop="fWarehouseName"/>
-      <el-table-column label="巡检人" align="center" prop="fInspectorName"/>
-      <el-table-column label="巡检计划日期起" align="center" prop="fInspectorBeginDatetime" width="180">
+      <el-table-column label="仓库名称" align="center" prop="fWarehouseName" width="280" show-overflow-tooltip/>
+      <el-table-column label="巡检人" align="center" prop="fInspectorName" show-overflow-tooltip/>
+      <el-table-column label="巡检计划日期起" align="center" prop="fInspectorBeginDatetime" width="180" show-overflow-tooltip>
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.fInspectorBeginDatetime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="巡检计划日期止" align="center" prop="fInspectorEndDatetime" width="180">
+      <el-table-column label="巡检计划日期止" align="center" prop="fInspectorEndDatetime" width="180" show-overflow-tooltip>
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.fInspectorEndDatetime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="制单人" align="center" prop="fCreateByName"/>
-      <el-table-column label="制单日期" align="center" prop="fCreateTime" width="180">
+      <el-table-column label="制单人" align="center" prop="fCreateByName" show-overflow-tooltip/>
+      <el-table-column label="制单日期" align="center" prop="fCreateTime" width="180" show-overflow-tooltip>
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.fCreateTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="更新人" align="center" prop="fUpdateByName"/>
-      <el-table-column label="最新时间" align="center" prop="fUpdateTime" width="180">
+      <el-table-column label="更新人" align="center" prop="fUpdateByName" show-overflow-tooltip/>
+      <el-table-column label="最新时间" align="center" prop="fUpdateTime" width="180" show-overflow-tooltip>
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.fUpdateTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="系统编号" align="center" prop="fSystemNo"/>
-      <el-table-column label="备注" align="center" prop="fRemark"/>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160">
+      <el-table-column label="系统编号" align="center" prop="fSystemNo" show-overflow-tooltip/>
+      <el-table-column label="备注" align="center" prop="fRemark" show-overflow-tooltip/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160" fixed="right">
         <template slot-scope="scope">
           <el-button
               size="mini"