Merge remote-tracking branch 'origin/dev' into dev

src/api/iosBasicData/containers.js

@@ -137,3 +137,11 @@ export const luHaiTongApiDetail = (params) => {
     params: params
   })
 }
+// 提取箱信息
+export const verifyData = (params) => {
+  return request({
+    url: '/api/blade-los/containers/verifyData',
+    method: 'get',
+    params: params
+  })
+}

src/api/iosBasicData/inventoryAccount.js

@@ -0,0 +1,34 @@
+import request from '@/router/axios';
+
+export const getList = (current, size, params) => {
+  return request({
+    url: '/api/blade-los/inventoryAccountStatistics/sum',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
+export const boxNumberProfitStatisticsSum = (data) => {
+  return request({
+    url: '/api/blade-los/inventoryAccountStatistics/list',
+    method: 'get',
+    params: data
+  })
+}
+
+export const getCorp= (current, size, params) => {
+  return request({
+    url: '/api/blade-los/bcorps/listByType',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+

src/api/iosBasicData/storageFeeF.js

@@ -30,17 +30,41 @@ export const submit = (data) => {
 }
 //贸易预付款删除
 export const remove = (data) => {
-  return request({
-      url: '/api/blade-los/payablestoragefees/remove',
-      method: 'post',
-      params: data
-  })
+    return request({
+        url: '/api/blade-los/payablestoragefees/remove',
+        method: 'post',
+        params: data
+    })
 }
 //贸易预付款删除
-export const ItemRemove = (data) => {
+export const itemRemove = (data) => {
     return request({
         url: '/api/blade-los/payablestoragefeesitems/remove',
         method: 'post',
         params: data
     })
-  }
+}
+
+export const calculateStorageFees = (data) => {
+    return request({
+        url: '/api/blade-los/payablestoragefees/calculateStorageFees',
+        method: 'get',
+        params: data
+    })
+}
+
+export const confirmSettlement = (data) => {
+    return request({
+        url: '/api/blade-los/payablestoragefees/confirmSettlement',
+        method: 'post',
+        data: data
+    })
+}
+
+export const revokeSettlement = (data) => {
+    return request({
+        url: '/api/blade-los/payablestoragefees/revokeSettlement',
+        method: 'post',
+        data: data
+    })
+}

src/router/views/index.js

@@ -4031,4 +4031,18 @@ export default [{
     component: () => import( /* webpackChunkName: "views" */ '@/views/iosBasicData/inventoryAccount/index')
   }]
 },
+{
+  path: '/iosBasicData/storageFeeF/index',
+  component: Layout,
+  hidden: true,
+  children: [{
+    path: '/iosBasicData/storageFeeF/index',
+    name: '仓储费(F)',
+    meta: {
+      i18n: '/iosBasicData/storageFeeF/index', 
+      keepAlive: true,
+    },
+    component: () => import( /* webpackChunkName: "views" */ '@/views/iosBasicData/storageFeeF/index')
+  }]
+},
 ]

src/util/date.js

@@ -231,12 +231,12 @@ function addZero(num) {
 }
 //验证英文
 export function verifyEnglish(str) {
-  const regex = /^[A-Za-z0-9\n .,!?:()|/+-_;'"$&@%*#]+$/;
+  const regex = /^[A-Za-z0-9\r\n .,!?:()|/+-_;'"$&@%*#]+$/;
   return regex.test(str ? str : null);
 }
 //验证符号
 export function verifySymbol(str) {
-  const regex = /^[A-Za-z0-9\n .,!?:()|/+-_;'"$&@%*#]+$/;
+  const regex = /^[A-Za-z0-9\r\n .,!?:()|/+-_;'"$&@%*#]+$/;
   return regex.test(str ? str : null);
 }
 // 匹配常见全角符号的正则表达式（包括标点、字母、数字等）

src/views/iosBasicData/AirtransportExport/bills/billsDetails.vue

@@ -12,7 +12,7 @@
                 </el-button>
                 <el-button type="success" size="small" @click="CopyDocumentsfun">复制单据
                 </el-button>
-                <el-button size="small" :loading="saveLoading" @click="previewDialogfun">预 览
+                <el-button size="small" :loading="saveLoading" @click="previewDialogfun" :disabled="!form.id">预 览
                 </el-button>
                 <el-button size="small" type="warning" :disabled="!form.id || detailData.seeDisabled"
                     v-if="form.status == 1" @click.stop="revokeDocumentApproval">撤销单据请核

src/views/iosBasicData/AirtransportImport/bills/billsDetails.vue

@@ -12,7 +12,7 @@
                 </el-button>
                 <el-button type="success" size="small" @click="CopyDocumentsfun">复制单据
                 </el-button>
-                <el-button size="small" :loading="saveLoading" @click="previewDialogfun">预 览
+                <el-button size="small" :loading="saveLoading" @click="previewDialogfun" :disabled="!form.id">预 览
                 </el-button>
                 <el-button size="small" type="warning" :disabled="!form.id || detailData.seeDisabled"
                     v-if="form.status == 1" @click.stop="revokeDocumentApproval">撤销单据请核

src/views/iosBasicData/OceanFreightImport/bills/assembly/feecenter.vue

@@ -2533,7 +2533,12 @@ export default {
                 row.podEnName = this.assemblyForm.podEnName // 卸货港英文名称
                 row.corpArgreementNo = this.assemblyForm.corpArgreementNo // 客户约号
             })
-
+            const loading = this.$loading({
+                lock: true,
+                text: '加载中',
+                spinner: 'el-icon-loading',
+                background: 'rgba(255,255,255,0.7)'
+            });
             feecenterSubmitList([
                 ...this.assemblyForm.feeCenterListD,
                 ...this.assemblyForm.feeCenterListC
@@ -2543,6 +2548,8 @@ export default {
                     message: "操作成功!"
                 });
                 this.$emit('billsDetailfun')
+            }).finally(() => {
+                loading.close()
             })
 
         },

src/views/iosBasicData/OceanFreightImport/bills/billsDetails.vue

@@ -31,7 +31,7 @@
                 </el-button>
                 <el-button type="success" size="small" @click="CopyDocumentsfun">复制单据
                 </el-button>
-                <el-button size="small" :loading="saveLoading" @click="previewDialogfun">预 览
+                <el-button size="small" :loading="saveLoading" @click="previewDialogfun" :disabled="!form.id">预 览
                 </el-button>
                 <el-button size="small" type="warning" :disabled="!form.id || detailData.seeDisabled || showLock"
                     v-if="form.status == 1" @click.stop="revokeDocumentApproval">撤销单据请核
@@ -1051,9 +1051,7 @@ export default {
                     arr = list
                 }
                 this.$refs.bcorps[0].selectionList = arr
-            } else {
-
-            }
+            } 
         },
         /* 远程模糊查询操作用户 */
         remoteMethod(value, name) {

src/views/iosBasicData/SeafreightExportF/bills/assembly/DistributionBox/PackingBusiness.vue

@@ -101,6 +101,9 @@
                         <el-button type="danger" plain size="small"
                             :disabled="pleasereviewType || detailData.seeDisabled || showLock"
                             @click.stop="BatchDelete">批量删除</el-button>
+                        <el-button type="primary" plain size="small"
+                            :disabled="pleasereviewType || detailData.seeDisabled || showLock"
+                            @click.stop="inVerifyData">数据校验</el-button>
                     </template>
                     <template slot-scope="scope" slot="menu">
                         <el-button v-if="!scope.row.$cellEdit" size="mini" type="text" icon="el-icon-edit"
@@ -155,6 +158,20 @@
                             :filterable="true"></dic-select>
                     </tempalte>
                 </avue-crud>
+                <el-dialog title="数据校验" :visible.sync="dialogVisible" width="60%" :before-close="handleClose"
+                    append-to-body>
+                    <span>
+                        <avue-crud :data="verifyDataList" :option="optionVerify" :row-style="rowStyle">
+                            <template slot="whether" slot-scope="{ row }">
+                                <i v-if="row.whether==1" class="el-icon-check" style="color: #E6A23C;"></i>
+                                <i v-if="row.whether==0" class="el-icon-close" style="color: #F56C6C;"></i>
+                            </template>
+                        </avue-crud>
+                    </span>
+                    <span slot="footer" class="dialog-footer">
+                        <el-button @click="dialogVisible = false" size="small">关 闭</el-button>
+                    </span>
+                </el-dialog>
             </el-tab-pane>
         </el-tabs>
         <!--<div class="tbasTop">-->
@@ -226,12 +243,14 @@ import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
 import {
     containerscommodityRemove,
     containerscommoditySubmit,
-    containerscommoditySubmitList
+    containerscommoditySubmitList,
+    verifyData
 } from "@/api/iosBasicData/containers";
 import { bcommodityList } from "@/api/iosBasicData/bcommodity";
 import { getBunitsList } from "@/api/iosBasicData/bunits";
 import { getWorkDicts } from "@/api/system/dictbiz";
 import dicSelect from "@/components/dicSelect/main";
+import { Header } from "element-ui";
 
 export default {
     components: { SearchQuery, dicSelect },
@@ -254,6 +273,56 @@ export default {
     },
     data() {
         return {
+            verifyDataList: [],
+            dialogVisible: false,
+            optionVerify: {
+                header: false,
+                menu: false,
+                align:'center',
+                column: [
+                    {
+                        label: '箱号',
+                        prop: 'cntrNo',
+                        overHidden: true,
+                    }, {
+                        label: '数量',
+                        prop: 'quantity',
+                        overHidden: true,
+                    }, {
+                        label: '毛重',
+                        prop: 'grossWeight',
+                        overHidden: true,
+                    }, {
+                        label: '净重',
+                        prop: 'netWeight',
+                        overHidden: true,
+                    }, {
+                        label: '尺码',
+                        prop: 'measurement',
+                        overHidden: true,
+                    }, {
+                        label: '装箱数量',
+                        prop: 'quantityTotal',
+                        overHidden: true,
+                    }, {
+                        label: '装箱毛重',
+                        prop: 'grossWeightTotal',
+                        overHidden: true,
+                    }, {
+                        label: '装箱净重',
+                        prop: 'netWeightTotal',
+                        overHidden: true,
+                    }, {
+                        label: '装箱尺码',
+                        prop: 'measurementTotal',
+                        overHidden: true,
+                    }, {
+                        label: '是否一致',
+                        prop: 'whether',
+                        overHidden: true,
+                    }
+                ]
+            },
             hscodeData: [], // 商品数据
             packingUnitData: [], // 包装
             dgPackingUnitData: [], // 危险品包装
@@ -405,6 +474,7 @@ export default {
                         labelWidth: 130,
                         width: "120",
                         type: 'number',
+                        cell: true,
                         controls: false,
                         overHidden: true,
                         display: false,
@@ -421,6 +491,7 @@ export default {
                         width: "120",
                         overHidden: true,
                         display: false,
+                        cell: true,
                         type: "select",
                         props: {
                             label: "cnName",
@@ -443,6 +514,7 @@ export default {
                         labelWidth: 130,
                         width: "120",
                         type: 'number',
+                        cell: true,
                         controls: false,
                         overHidden: true,
                         display: false,
@@ -458,6 +530,7 @@ export default {
                         labelWidth: 130,
                         width: "120",
                         type: 'number',
+                        cell: true,
                         controls: false,
                         overHidden: true,
                         display: false,
@@ -468,6 +541,7 @@ export default {
                         labelWidth: 130,
                         width: "120",
                         type: 'number',
+                        cell: true,
                         controls: false,
                         overHidden: true,
                         display: false,
@@ -482,6 +556,7 @@ export default {
                         prop: "isDangerous",
                         labelWidth: 130,
                         width: "120",
+                        cell: true,
                         overHidden: true,
                         type: "select",
                         dicData: [],
@@ -496,6 +571,7 @@ export default {
                         prop: "dgImdgCode",
                         labelWidth: 130,
                         width: "200",
+                        cell: true,
                         overHidden: true,
                         display: false,
                     },
@@ -504,6 +580,7 @@ export default {
                         prop: "dgImdgName",
                         labelWidth: 130,
                         width: "140",
+                        cell: true,
                         overHidden: true,
                         display: false,
                     },
@@ -512,6 +589,7 @@ export default {
                         prop: "dgUnCode",
                         labelWidth: 130,
                         width: "120",
+                        cell: true,
                         overHidden: true,
                         display: false,
                     },
@@ -520,6 +598,7 @@ export default {
                         prop: "dgCommodityName",
                         labelWidth: 130,
                         width: "120",
+                        cell: true,
                         overHidden: true,
                         display: false,
                     },
@@ -530,6 +609,7 @@ export default {
                         width: "120",
                         overHidden: true,
                         display: false,
+                        cell: true,
                         // dicUrl: '/api/blade-system/dict-biz/dictionary?code=hazardous_Units',
                     },
                     {
@@ -539,6 +619,7 @@ export default {
                         width: "120",
                         overHidden: true,
                         display: false,
+                        cell: true,
                     },
                     {
                         label: "易燃易爆品闪点",
@@ -549,6 +630,7 @@ export default {
                         controls: false,
                         overHidden: true,
                         display: false,
+                        cell: true,
                     },
                     {
                         label: "易燃易爆品闪点单位",
@@ -557,6 +639,7 @@ export default {
                         width: "140",
                         overHidden: true,
                         display: false,
+                        cell: true,
                     },
                     {
                         label: "危险品联系人",
@@ -565,6 +648,7 @@ export default {
                         width: "120",
                         overHidden: true,
                         display: false,
+                        cell: true,
                     },
                     {
                         label: "危险品联系人电话",
@@ -573,6 +657,7 @@ export default {
                         width: "120",
                         overHidden: true,
                         display: false,
+                        cell: true,
                     },
                     {
                         label: "是否海洋污染物",
@@ -587,6 +672,7 @@ export default {
                             value: "dictKey"
                         },
                         display: false,
+                        cell: true,
                     },
                     {
                         label: "是否申报数量",
@@ -601,6 +687,7 @@ export default {
                             value: "dictKey"
                         },
                         display: false,
+                        cell: true,
                     },
                     {
                         label: "CAS NO",
@@ -617,6 +704,7 @@ export default {
                         width: "120",
                         overHidden: true,
                         display: false,
+                        cell: true,
                     },
                     {
                         label: "DC Weight",
@@ -627,6 +715,7 @@ export default {
                         controls: false,
                         overHidden: true,
                         display: false,
+                        cell: true,
                     },
                     {
                         label: "Emergency温度",
@@ -637,6 +726,7 @@ export default {
                         width: "120",
                         overHidden: true,
                         display: false,
+                        cell: true,
                     },
                     {
                         label: "Emergency温度单位",
@@ -645,6 +735,7 @@ export default {
                         width: "140",
                         overHidden: true,
                         display: false,
+                        cell: true,
                     },
                     {
                         label: "Control温度",
@@ -655,6 +746,7 @@ export default {
                         width: "120",
                         overHidden: true,
                         display: false,
+                        cell: true,
                     },
                     {
                         label: "Control温度单位",
@@ -663,6 +755,7 @@ export default {
                         width: "120",
                         overHidden: true,
                         display: false,
+                        cell: true,
                     },
                     {
                         label: "左超 厘米",
@@ -673,6 +766,7 @@ export default {
                         width: "120",
                         overHidden: true,
                         display: false,
+                        cell: true,
                     },
                     {
                         label: "右超 厘米",
@@ -683,6 +777,7 @@ export default {
                         width: "120",
                         overHidden: true,
                         display: false,
+                        cell: true,
                     },
                     {
                         label: "前超 厘米",
@@ -693,6 +788,7 @@ export default {
                         width: "120",
                         overHidden: true,
                         display: false,
+                        cell: true,
                     },
                     {
                         label: "后超 厘米",
@@ -703,6 +799,7 @@ export default {
                         width: "120",
                         overHidden: true,
                         display: false,
+                        cell: true,
                     },
                     {
                         label: "超高 厘米",
@@ -713,6 +810,7 @@ export default {
                         width: "120",
                         overHidden: true,
                         display: false,
+                        cell: true,
                     },
                     {
                         label: "CUS CODE",
@@ -721,6 +819,7 @@ export default {
                         width: "120",
                         overHidden: true,
                         display: false,
+                        cell: true,
                     },
                     {
                         label: "NCM",
@@ -729,6 +828,7 @@ export default {
                         width: "120",
                         overHidden: true,
                         display: false,
+                        cell: true,
                     },
                 ],
                 group: [
@@ -1244,6 +1344,25 @@ export default {
 
     },
     methods: {
+        rowStyle({ row, column, rowIndex }) {
+            if (row.whether == 0) {
+                return {
+                    color: '#F56C6C'
+                }
+            }
+            if (row.whether == 1) {
+                return {
+                    color: '#E6A23C'
+                }
+            }
+        },
+        inVerifyData() {
+            this.dialogVisible = true
+            this.verifyDataList = []
+            verifyData({ billId: this.assemblyForm.id }).then(res => {
+                this.verifyDataList = res.data.data
+            })
+        },
         // 货物详情弹窗开启
         DetailAdd() {
             this.Detailform.packingUnit = this.assemblyForm.packingUnit

src/views/iosBasicData/SeafreightExportF/bills/assembly/feecenter.vue

@@ -2624,7 +2624,12 @@ export default {
                 row.podEnName = this.assemblyForm.podEnName // 卸货港英文名称
                 row.corpArgreementNo = this.assemblyForm.corpArgreementNo // 客户约号
             })
-
+            const loading = this.$loading({
+                lock: true,
+                text: '加载中',
+                spinner: 'el-icon-loading',
+                background: 'rgba(255,255,255,0.7)'
+            });
             feecenterSubmitList([
                 ...this.assemblyForm.feeCenterListD,
                 ...this.assemblyForm.feeCenterListC
@@ -2634,6 +2639,8 @@ export default {
                     message: "操作成功!"
                 });
                 this.$emit('billsDetailfun')
+            }).finally(() => {
+                loading.close()
             })
 
         },

src/views/iosBasicData/SeafreightExportF/bills/billsDetails.vue

@@ -54,7 +54,8 @@
                     </el-dropdown-menu>
                 </el-dropdown>
 
-                <el-button size="small" style="margin-right: 8px" :loading="saveLoading" @click="previewDialogfun">预 览
+                <el-button size="small" style="margin-right: 8px" :loading="saveLoading" :disabled="!form.id"
+                    @click="previewDialogfun">预 览
                 </el-button>
                 <el-button size="small" type="warning" :disabled="!form.id || detailData.seeDisabled || showLock"
                     v-if="form.status == 1" @click.stop="revokeDocumentApproval">撤销单据请核
@@ -989,12 +990,14 @@ export default {
                     Object.keys(res).forEach(key => {
                         if (res[key]) {
                             if (key != 'detail') {
-                                this.form[key] = res[key]
+                                // this.form[key] = res[key]
+                                this.$set(this.form, key, res[key])
                             }
                             if (key == 'detail') {
                                 Object.keys(res.detail).forEach(key => {
                                     if (res.detail[key]) {
-                                        this.form.detail[key] = res.detail[key]
+                                        // this.form.detail[key] = res.detail[key]
+                                        this.$set(this.form.detail, key, res.detail[key])
                                     }
                                 });
                             }
@@ -2048,6 +2051,7 @@ export default {
                                 return
                             }
                         }
+                        console.log(this.form.detail)
                         if (!verifyEnglish(this.form.detail.hshipperDetails)) {
                             msgsList.push('发货人')
                         }

src/views/iosBasicData/UnpaidPaymentsDetails/index.vue

@@ -1,96 +1,56 @@
 <template>
     <basic-container>
-        <avue-crud :option="option"
-                   :table-loading="loading"
-                   :data="data"
-                   :page.sync="page"
-                   :search.sync="query"
-                   v-model="form"
-                   ref="crud"
-                   id="out-table"
-                   :header-cell-class-name="headerClassName"
-                   @search-change="searchChange"
-                   @search-reset="searchReset"
-                   @current-change="currentChange"
-                   @size-change="sizeChange"
-                   @refresh-change="refreshChange"
-                   @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 334)"
-                   @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 334)"
-                   @on-load="onLoad" >
+        <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" :search.sync="query"
+            v-model="form" ref="crud" id="out-table" :header-cell-class-name="headerClassName"
+            @search-change="searchChange" @search-reset="searchReset" @current-change="currentChange"
+            @size-change="sizeChange" @refresh-change="refreshChange"
+            @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 334)"
+            @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 334)" @on-load="onLoad">
             <template slot="menuLeft">
-                <el-button type="success" size="small" plain @click="exportfun" >导出</el-button>
+                <el-button type="success" size="small" plain @click="exportfun">导出</el-button>
             </template>
             <template slot="header">
-                <el-table
-                    :data="commodityData"
-                    border
-                    size="small"
-                    @header-click="cellClick"
-                    style="width: 100%">
-                    <el-table-column
-                        v-for="(item,index) in commodityLabel" :key="index"
-                        :prop="item.prop"
-                        show-overflow-tooltip
-                        :label="item.label" />
+                <el-table :data="commodityData" border size="small" @header-click="cellClick" style="width: 100%">
+                    <el-table-column v-for="(item, index) in commodityLabel" :key="index" :prop="item.prop"
+                        show-overflow-tooltip :label="item.label" />
                 </el-table>
             </template>
             <template slot-scope="{disabled,size}" slot="dcSearch">
-                <el-radio v-model="query.dc" label="D" @input="dcInput" >应收</el-radio>
-                <el-radio v-model="query.dc" label="C" @input="dcInput" >应付</el-radio>
+                <el-radio v-model="query.dc" label="D" @input="dcInput">应收</el-radio>
+                <el-radio v-model="query.dc" label="C" @input="dcInput">应付</el-radio>
             </template>
 
             <template slot-scope="{disabled,size}" slot="businessTypeSearch">
-                <search-query :datalist="businessTypeData"
-                              :selectValue="query.businessType"
-                              :clearable="true"
-                              :buttonIf="false"
-                              :forParameter="{ key:'dictKey', label:'dictValue', value:'dictKey'}"
-                              @corpFocus="businessTypeFocus"
-                              @corpChange="corpChange($event,'businessType')">
+                <search-query :datalist="businessTypeData" :selectValue="query.businessType" :clearable="true"
+                    :buttonIf="false" :forParameter="{ key: 'dictKey', label: 'dictValue', value: 'dictKey' }"
+                    @corpFocus="businessTypeFocus" @corpChange="corpChange($event, 'businessType')">
                 </search-query>
             </template>
             <template slot-scope="{disabled,size}" slot="clientIdSearch">
-                <search-query :datalist="clientIdData"
-                              :selectValue="query.clientName"
-                              :filterable="true"
-                              :remote="true"
-                              :clearable="true"
-                              :buttonIf="false"
-                              :forParameter="{key:'id',label:'cnName',value:'cnName'}"
-                              @remoteMethod="clientIdListfun"
-                              @corpFocus="clientIdListfun"
-                              @corpChange="corpChange($event,'clientName')">
+                <search-query :datalist="clientIdData" :selectValue="query.clientName" :filterable="true" :remote="true"
+                    :clearable="true" :buttonIf="false" :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
+                    @remoteMethod="clientIdListfun" @corpFocus="clientIdListfun"
+                    @corpChange="corpChange($event, 'clientName')">
                 </search-query>
             </template>
             <template slot-scope="{disabled,size}" slot="corpIdSearch">
-                <search-query :datalist="corpIdData"
-                              :selectValue="query.corpName"
-                              :filterable="true"
-                              :remote="true"
-                              :clearable="true"
-                              :buttonIf="false"
-                              :forParameter="{key:'id',label:'cnName',value:'cnName'}"
-                              @remoteMethod="getBcorpsListfun"
-                              @corpFocus="getBcorpsListfun"
-                              @corpChange="corpChange($event,'corpName')">
+                <search-query :datalist="corpIdData" :selectValue="query.corpName" :filterable="true" :remote="true"
+                    :clearable="true" :buttonIf="false" :forParameter="{ key: 'id', label: 'cnName', value: 'cnName' }"
+                    @remoteMethod="getBcorpsListfun" @corpFocus="getBcorpsListfun"
+                    @corpChange="corpChange($event, 'corpName')">
                 </search-query>
             </template>
             <template slot-scope="{disabled,size}" slot="srcIdSearch">
-                <search-query :datalist="srcIdData"
-                              :selectValue="query.srcName"
-                              :filterable="true"
-                              :remote="true"
-                              :clearable="true"
-                              :buttonIf="false"
-                              :forParameter="{ key:'id', label:'name', value:'name'}"
-                              @remoteMethod="srcCorpFocus"
-                              @corpFocus="srcCorpFocus"
-                              @corpChange="corpChange($event,'srcName')">
+                <search-query :datalist="srcIdData" :selectValue="query.srcName" :filterable="true" :remote="true"
+                    :clearable="true" :buttonIf="false" :forParameter="{ key: 'id', label: 'name', value: 'name' }"
+                    @remoteMethod="srcCorpFocus" @corpFocus="srcCorpFocus" @corpChange="corpChange($event, 'srcName')">
                 </search-query>
             </template>
             <template slot-scope="{disabled,size}" slot="isBusinessDateSearch">
-                <el-checkbox v-model="query.isBusinessDate" :true-label="1" :false-label="0" @change="dateChange('isBusinessDate')" >按业务日期</el-checkbox>
-                <el-checkbox v-model="query.isToExamineDate" :true-label="1" :false-label="0" @change="dateChange('isToExamineDate')" >按审核日期</el-checkbox>
+                <el-checkbox v-model="query.isBusinessDate" :true-label="1" :false-label="0"
+                    @change="dateChange('isBusinessDate')">按业务日期</el-checkbox>
+                <el-checkbox v-model="query.isToExamineDate" :true-label="1" :false-label="0"
+                    @change="dateChange('isToExamineDate')">按审核日期</el-checkbox>
             </template>
 
         </avue-crud>
@@ -99,20 +59,20 @@
 
 <script>
 import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
-import {CurrentMonth, dateFormat, defaultDate3, defaultDate4} from "@/util/date";
+import { CurrentMonth, dateFormat, defaultDate3, defaultDate4 } from "@/util/date";
 import {
     financeStatisticsFeeSummaryDetailNot,
     financeStatisticsFeeSummaryDetailNotSum
 } from "@/api/iosBasicData/paymentSummary"
-import {getBcorpsList, getBcorpslistByType} from "@/api/iosBasicData/bcorps";
-import {getWorkDicts} from "@/api/system/dictbiz";
-import {getDeptLazyTree} from "@/api/system/dept";
-import {getList as userGetList} from '@/api/system/user'
-import {getToken} from "@/util/auth";
+import { getBcorpsList, getBcorpslistByType } from "@/api/iosBasicData/bcorps";
+import { getWorkDicts } from "@/api/system/dictbiz";
+import { getDeptLazyTree } from "@/api/system/dept";
+import { getList as userGetList } from '@/api/system/user'
+import { getToken } from "@/util/auth";
 
 export default {
-    components: {SearchQuery},
-    data(){
+    components: { SearchQuery },
+    data() {
         return {
             form: {},
             loading: true,
@@ -122,15 +82,15 @@ export default {
                 total: 0
             },
             query: {
-                dc:'D',
-                isBusinessDate:1,
-                isToExamineDate:0,
-                etdStart:defaultDate3()[0],
-                etdEnd:defaultDate3()[1],
+                dc: 'D',
+                isBusinessDate: 1,
+                isToExamineDate: 0,
+                etdStart: defaultDate3()[0],
+                etdEnd: defaultDate3()[1],
             },
-            option:{},
-            optionBack:{
-                height:'auto',
+            option: {},
+            optionBack: {
+                height: 'auto',
                 calcHeight: 30,
                 tip: false,
                 searchShow: true,
@@ -139,14 +99,14 @@ export default {
                 index: false,
                 selection: true,
                 dialogClickModal: false,
-                menu:false,
-                addBtn:false,
-                viewBtn:false,
-                delBtn:false,
-                editBtn:false,
-                emptyBtnText:'清空所有条件',
-                column:[
-                {
+                menu: false,
+                addBtn: false,
+                viewBtn: false,
+                delBtn: false,
+                editBtn: false,
+                emptyBtnText: '清空所有条件',
+                column: [
+                    {
                         label: "业务类型",
                         prop: "businessType",
                         type: 'select',
@@ -160,135 +120,135 @@ export default {
                     {
                         label: "结算单位",
                         prop: "corpName",
-                        overHidden:true,
+                        overHidden: true,
                     },
                     {
                         label: "业务编号",
                         prop: "billNo",
-                        search:true,
-                        overHidden:true,
+                        search: true,
+                        overHidden: true,
                     },
                     {
                         label: "提单号",
                         prop: "mblNo",
-                        search:true,
-                        overHidden:true,
+                        search: true,
+                        overHidden: true,
                     },
                     {
                         label: "船名",
                         prop: "vesselName",
-                        overHidden:true,
+                        overHidden: true,
                     },
                     {
                         label: "航次",
                         prop: "voyageNo",
-                        overHidden:true,
+                        overHidden: true,
                     },
                     {
                         label: "开船日期",
                         prop: "etd",
-                        overHidden:true,
+                        overHidden: true,
                     },
                     {
                         label: "提单号",
                         prop: "mblNo",
-                        overHidden:true,
+                        overHidden: true,
                     },
                     {
                         label: "起运港",
                         prop: "pod",
-                        overHidden:true,
+                        overHidden: true,
                     },
                     {
                         label: "目的港",
                         prop: "pol",
-                        overHidden:true,
+                        overHidden: true,
                     },
                     {
                         label: "汇率",
                         prop: "rate",
-                        overHidden:true,
+                        overHidden: true,
                     },
                     {
                         label: "箱型箱量",
                         prop: "quantityCntrDescr",
-                        overHidden:true,
+                        overHidden: true,
                     },
                     {
                         label: "美元",
                         prop: "amountUsdNot",
-                        overHidden:true,
+                        overHidden: true,
                     },
                     {
                         label: "人民币",
                         prop: "amountNot",
-                        overHidden:true,
+                        overHidden: true,
                     },
                     {
                         label: "开票USD",
                         prop: "amountInvoicingUsd",
-                        overHidden:true,
+                        overHidden: true,
                     },
                     {
                         label: "开票CNY",
                         prop: "amountInvoicing",
-                        overHidden:true,
+                        overHidden: true,
                     },
                     {
                         label: "未开USD",
                         prop: "amountInvoicingUsdNot",
-                        overHidden:true,
+                        overHidden: true,
                     },
                     {
                         label: "未开CNY",
                         prop: "amountInvoicingNot",
-                        overHidden:true,
+                        overHidden: true,
                     },
                     {
                         label: "业务员",
                         prop: "srcCnName",
-                        overHidden:true,
+                        overHidden: true,
                     },
                     {
                         label: "操作员",
                         prop: "operatorName",
-                        overHidden:true,
+                        overHidden: true,
                     },
 
                     {
                         label: "业务类型",
                         prop: "businessType",
-                        hide:true,
-                        search:true,
-                        searchslot:true,
+                        hide: true,
+                        search: true,
+                        searchslot: true,
                     },
                     {
                         label: "委托人",
                         prop: "clientId",
-                        hide:true,
-                        search:true,
-                        searchslot:true,
+                        hide: true,
+                        search: true,
+                        searchslot: true,
                     },
                     {
                         label: "结算单位",
                         prop: "corpId",
-                        hide:true,
-                        search:true,
-                        searchslot:true,
+                        hide: true,
+                        search: true,
+                        searchslot: true,
                     },
                     {
                         label: "业务员",
                         prop: "srcId",
-                        hide:true,
-                        search:true,
-                        searchslot:true,
+                        hide: true,
+                        search: true,
+                        searchslot: true,
                     },
                     {
                         label: "统计开始",
                         prop: "etdStart",
-                        search:true,
-                        overHidden:true,
-                        hide:true,
+                        search: true,
+                        overHidden: true,
+                        hide: true,
                         type: "date",
                         format: "yyyy-MM-dd",
                         valueFormat: "yyyy-MM-dd",
@@ -296,9 +256,9 @@ export default {
                     {
                         label: "统计结束",
                         prop: "etdEnd",
-                        search:true,
-                        overHidden:true,
-                        hide:true,
+                        search: true,
+                        overHidden: true,
+                        hide: true,
                         type: "date",
                         format: "yyyy-MM-dd",
                         valueFormat: "yyyy-MM-dd",
@@ -306,79 +266,79 @@ export default {
                     {
                         label: "",
                         prop: "dc",
-                        hide:true,
-                        search:true,
-                        searchslot:true,
-                        searchSpan:4,
-                        searchLabelWidth:'0'
+                        hide: true,
+                        search: true,
+                        searchslot: true,
+                        searchSpan: 4,
+                        searchLabelWidth: '0'
                     },
                     {
                         label: "",
                         prop: "isBusinessDate",
-                        hide:true,
-                        search:true,
-                        searchslot:true,
-                        searchLabelWidth:'0'
+                        hide: true,
+                        search: true,
+                        searchslot: true,
+                        searchLabelWidth: '0'
                     },
                     {
                         label: "",
                         prop: "isToExamineDate",
-                        hide:true,
-                        searchLabelWidth:'0',
+                        hide: true,
+                        searchLabelWidth: '0',
                     },
 
                 ]
             },
-            data:[],
+            data: [],
             // 查询方式
-            typeData:[
+            typeData: [
                 {
-                    label:'结算单位',
-                    value:'1'
-                },{
-                    label:'委托人',
-                    value:'2'
-                },{
-                    label:'业务来源',
-                    value:'3'
+                    label: '结算单位',
+                    value: '1'
+                }, {
+                    label: '委托人',
+                    value: '2'
+                }, {
+                    label: '业务来源',
+                    value: '3'
                 }
             ],
             // 业务类型
-            businessTypeData:[],
-            clientIdData:[], // 委托人
-            corpIdData:[], // 结算单位
-            srcIdData:[], // 业务员
+            businessTypeData: [],
+            clientIdData: [], // 委托人
+            corpIdData: [], // 结算单位
+            srcIdData: [], // 业务员
 
-            commodityData:[], // 合计数据
+            commodityData: [], // 合计数据
             // 合计的配置项
-            commodityLabel:[
+            commodityLabel: [
                 {
-                    id:1,
+                    id: 1,
                     label: "美元",
                     prop: "amountUsdNot",
                 },
                 {
-                    id:2,
+                    id: 2,
                     label: "人民币",
                     prop: "amountNot",
                 },
                 {
-                    id:3,
+                    id: 3,
                     label: "开票USD",
                     prop: "amountInvoicingUsd",
                 },
                 {
-                    id:4,
+                    id: 4,
                     label: "开票CNY",
                     prop: "amountInvoicing",
                 },
                 {
-                    id:5,
+                    id: 5,
                     label: "未开USD",
                     prop: "amountInvoicingUsdNot",
                 },
                 {
-                    id:6,
+                    id: 6,
                     label: "未开CNY",
                     prop: "amountInvoicingNot",
                 },
@@ -388,10 +348,17 @@ export default {
     },
     async created() {
         this.option = await this.getColumnData(this.getColumnName(334), this.optionBack);
+        this.query = {
+            dc: 'D',
+            isBusinessDate: 1,
+            isToExamineDate: 0,
+            etdStart: defaultDate3()[0],
+            etdEnd: defaultDate3()[1],
+        }
     },
-    methods:{
+    methods: {
         // 导出
-        exportfun(){
+        exportfun() {
             const routeData = this.$router.resolve({
                 path: '/api/blade-los/financeStatistics/feeSummaryDetailExportNot',//跳转目标窗口的地址
                 query: {
@@ -401,55 +368,55 @@ export default {
             window.open(routeData.href.slice(1, routeData.href.length) + '&' + `${this.website.tokenHeader}=${getToken()}`);
         },
         // 下拉监听
-        corpChange(value,name){
+        corpChange(value, name) {
             if (name == 'corpName') {
                 for (let item of this.corpIdData) {
                     if (item.cnName == value) {
-                        this.$set(this.query,'corpId',item.id)
-                        this.$set(this.query,'corpName',item.cnName)
+                        this.$set(this.query, 'corpId', item.id)
+                        this.$set(this.query, 'corpName', item.cnName)
                     }
                 }
             } else if (name == 'clientName') {
                 for (let item of this.clientIdData) {
                     if (item.cnName == value) {
-                        this.$set(this.query,'clientId',item.id)
-                        this.$set(this.query,'clientName',item.cnName)
+                        this.$set(this.query, 'clientId', item.id)
+                        this.$set(this.query, 'clientName', item.cnName)
                     }
                 }
-            }else if (name == 'srcName') {
+            } else if (name == 'srcName') {
                 for (let item of this.srcIdData) {
                     if (item.name == value) {
                         // 业务员
-                        this.$set(this.query,'srcId',item.id)
-                        this.$set(this.query,'srcName',item.name)
+                        this.$set(this.query, 'srcId', item.id)
+                        this.$set(this.query, 'srcName', item.name)
                     }
                 }
             }
-            this.$set(this.query,name,value)
+            this.$set(this.query, name, value)
         },
         // 业务员下拉
-        srcCorpFocus(value,name){
+        srcCorpFocus(value, name) {
             this.salesUserGetListfun(value)
         },
         // 多选切换
         dateChange(name) {
             if (name == 'isBusinessDate') {
-                this.$set(this.query,'isToExamineDate',0)
-                this.$set(this.query,'isBusinessDate',1)
+                this.$set(this.query, 'isToExamineDate', 0)
+                this.$set(this.query, 'isBusinessDate', 1)
             }
             if (name == 'isToExamineDate') {
-                this.$set(this.query,'isBusinessDate',0)
-                this.$set(this.query,'isToExamineDate',1)
+                this.$set(this.query, 'isBusinessDate', 0)
+                this.$set(this.query, 'isToExamineDate', 1)
             }
             this.page.currentPage = 1;
             this.onLoad(this.page, this.query);
         },
         // 收付单选
-        dcInput(){
+        dcInput() {
             let dcName = ''
             if (this.query.dc == 'D') {
                 dcName = '收'
-            }else {
+            } else {
                 dcName = '付'
             }
             this.findObject(this.option.column, "amountUsd").label = `应${dcName}美金`
@@ -464,56 +431,56 @@ export default {
         },
         // 接口获取数据
         // 结算单位
-        getBcorpsListfun(cnName){
-            getBcorpsList(1,10,{cnName,status: 0}).then(res=>{
+        getBcorpsListfun(cnName) {
+            getBcorpsList(1, 10, { cnName, status: 0 }).then(res => {
                 this.corpIdData = res.data.data.records
             })
         },
         // 业务类型
-        businessTypeFocus(){
-            getWorkDicts('profit_business_type_los').then(res=>{
+        businessTypeFocus() {
+            getWorkDicts('profit_business_type_los').then(res => {
                 this.businessTypeData = res.data.data
             })
         },
         // 委托人
-        clientIdListfun(cnName){
-            getBcorpsList(1,10,{cnName,status: 0}).then(res=>{
+        clientIdListfun(cnName) {
+            getBcorpsList(1, 10, { cnName, status: 0 }).then(res => {
                 this.clientIdData = res.data.data.records
             })
         },
         // 获取业务来源数据
-        srcTypeWorkDictsfun(){
-            getWorkDicts('src_type_los').then(res=>{
+        srcTypeWorkDictsfun() {
+            getWorkDicts('src_type_los').then(res => {
                 this.srcTypeData = res.data.data
             })
         },
         // 获取公司名称 用户管理左侧
-        ownDeptLazyTreefun(){
-            getDeptLazyTree(0).then(res=>{
+        ownDeptLazyTreefun() {
+            getDeptLazyTree(0).then(res => {
                 this.srcIdData = res.data.data
             })
         },
         // 获取业务来源代理数据
-        agentBcorpsListfun(cnName){
+        agentBcorpsListfun(cnName) {
             let corpTypeName = '国内直接客户,国内同行及代理,国外直接客户,国外同行及代理'
-            getBcorpslistByType(1,10,{cnName,status: 0,corpTypeName}).then(res=>{
+            getBcorpslistByType(1, 10, { cnName, status: 0, corpTypeName }).then(res => {
                 this.srcIdData = res.data.data.records
             })
         },
         // 获取业务来源业务员数据
-        salesUserGetListfun(account){
-            userGetList(1,10,{account}).then(res=>{
+        salesUserGetListfun(account) {
+            userGetList(1, 10, { account }).then(res => {
                 this.srcIdData = res.data.data.records
             })
         },
         // 清空搜索回调方法
         searchReset() {
             this.query = {
-                dc:'D',
-                isBusinessDate:1,
-                isToExamineDate:0,
-                etdStart:null,
-                etdEnd:null,
+                dc: 'D',
+                isBusinessDate: 1,
+                isToExamineDate: 0,
+                etdStart: null,
+                etdEnd: null,
             };
             this.onLoad(this.page);
         },
@@ -523,10 +490,10 @@ export default {
             this.onLoad(this.page, this.query);
             done();
         },
-        currentChange(currentPage){
+        currentChange(currentPage) {
             this.page.currentPage = currentPage;
         },
-        sizeChange(pageSize){
+        sizeChange(pageSize) {
             this.page.pageSize = pageSize;
         },
         refreshChange() {
@@ -539,7 +506,7 @@ export default {
                 this.page.total = data.total;
                 this.data = data.records;
                 this.loading = false;
-                financeStatisticsFeeSummaryDetailNotSum(Object.assign(params, this.query)).then(re=>{
+                financeStatisticsFeeSummaryDetailNotSum(Object.assign(params, this.query)).then(re => {
                     this.commodityData = [re.data.data]
                 })
                 this.$nextTick(() => {
@@ -574,16 +541,16 @@ export default {
                 this.$message.success("重置成功");
                 this.$refs[ref].$refs.dialogColumn.columnBox = false;
                 this.query = {
-                    dc:'D',
-                    isBusinessDate:1,
-                    isToExamineDate:0,
-                    etdStart:defaultDate3()[0],
-                    etdEnd:defaultDate3()[1],
+                    dc: 'D',
+                    isBusinessDate: 1,
+                    isToExamineDate: 0,
+                    etdStart: defaultDate3()[0],
+                    etdEnd: defaultDate3()[1],
                 }
             }
         },
         // 更改表格颜色
-        headerClassName(tab){
+        headerClassName(tab) {
             //颜色间隔
             let back = ""
             if (tab.columnIndex >= 0 && tab.column.level === 1) {
@@ -604,6 +571,7 @@ export default {
     background: #ecf5ff !important;
     text-align: center;
 }
+
 ::v-deep#out-table .back-two {
     background: #ecf5ff !important;
     text-align: center;

src/views/iosBasicData/bunits/index.vue

@@ -262,13 +262,13 @@ export default {
       data: []
     };
   },
-  props:{
-      // 是否的弹窗状态打开
-      eldialog:{
-          type:Boolean,
-          default:false
-      }
-  },
+  // props:{
+  //     // 是否的弹窗状态打开
+  //     eldialog:{
+  //         type:Boolean,
+  //         default:false
+  //     }
+  // },
   computed: {
     ...mapGetters(["permission"]),
     permissionList() {
@@ -465,7 +465,7 @@ export default {
     selectionChange(list) {
       this.selectionList = list;
       // 选择的数据抛出
-      this.$emit('selectionChange', list)
+      // this.$emit('selectionChange', list)
     },
     selectionClear() {
       this.selectionList = [];

src/views/iosBasicData/financeProfit/index.vue

@@ -1,9 +1,10 @@
 <template>
     <basic-container>
         <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" :search.sync="query"
-            v-model="form" ref="crud" id="out-table" :header-cell-class-name="headerClassName" @search-change="searchChange"
-            @search-reset="searchReset" @current-change="currentChange" @size-change="sizeChange"
-            @refresh-change="refreshChange" @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 336)"
+            v-model="form" ref="crud" id="out-table" :header-cell-class-name="headerClassName"
+            @search-change="searchChange" @search-reset="searchReset" @current-change="currentChange"
+            @size-change="sizeChange" @refresh-change="refreshChange"
+            @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 336)"
             @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 336)" @on-load="onLoad">
             <template slot="menuLeft">
                 <el-button type="success" size="small" plain @click="exportfun">导出</el-button>
@@ -48,8 +49,8 @@
             </template>
             <template slot-scope="{disabled,size}" slot="srcTypeSearch">
                 <search-query :datalist="srcTypeData" :selectValue="query.srcType" :clearable="true" :buttonIf="false"
-                    :forParameter="{ key: 'dictKey', label: 'dictValue', value: 'dictKey' }" @corpFocus="srcTypeWorkDictsfun"
-                    @corpChange="corpChange($event, 'srcType')">
+                    :forParameter="{ key: 'dictKey', label: 'dictValue', value: 'dictKey' }"
+                    @corpFocus="srcTypeWorkDictsfun" @corpChange="corpChange($event, 'srcType')">
                 </search-query>
             </template>
             <template slot-scope="{disabled,size}" slot="salesmanSearch">
@@ -133,7 +134,7 @@ export default {
                 editBtn: false,
                 searchIcon: true,
                 searchIndex: 3,
-                emptyBtnText:'清空所有条件',
+                emptyBtnText: '清空所有条件',
                 showSummary: true,
                 summaryText: "合计",
                 sumColumnList: [
@@ -224,7 +225,7 @@ export default {
                     {
                         label: "M B/L",
                         prop: "mblNo",
-                        search:true,
+                        search: true,
                         overHidden: true,
                         searchOrder: 12
                     },
@@ -515,6 +516,12 @@ export default {
     },
     async created() {
         this.option = await this.getColumnData(this.getColumnName(336), this.optionBack);
+        this.query = {
+            billType: 'SE,SI',
+            costMerge: 1,
+            statisticsDateStart: defaultDate3()[0],
+            statisticsDateEnd: defaultDate3()[1],
+        }
         this.getWorkDictsfun()
         this.getLazylistfun() // 获取部门数据
     },

src/views/iosBasicData/inventoryAccount/index.vue

@@ -38,7 +38,7 @@
 </template>
 
 <script>
-import { getList, boxNumberProfitStatisticsSum } from "@/api/iosBasicData/costStatistics";
+import { getList, boxNumberProfitStatisticsSum } from "@/api/iosBasicData/inventoryAccount";
 import { getToken } from "@/util/auth";
 export default {
     data() {
@@ -58,7 +58,7 @@ export default {
                 height: '600px',
                 calcHeight: 30,
                 searchShow: true,
-                searchMenuSpan: 18,
+                searchMenuSpan: 24,
                 border: true,
                 index: true,
                 addBtn: false,
@@ -76,19 +76,19 @@ export default {
                     },
                     {
                         label: "合同号",
-                        prop: "billNo",
+                        prop: "contractNo",
                         search: true,
                         overHidden: true,
                     },
                     {
                         label: "委托编号",
-                        prop: "srcNo",
+                        prop: "billNo",
                         search: true,
                         overHidden: true,
                     },
                     {
                         label: "箱号",
-                        prop: "srcNo",
+                        prop: "boxNo",
                         search: true,
                         overHidden: true,
                     },
@@ -109,9 +109,8 @@ export default {
                     },
                     {
                         label: "入库日期",
-                        prop: "billDate",
+                        prop: "storageDate",
                         overHidden: true,
-                        searchProp: "etdList",
                         type: "date",
                         unlinkPanels: true,
                         searchRange: true,
@@ -121,74 +120,74 @@ export default {
                     },
                     {
                         label: "货物名称",
-                        prop: "feeName",
+                        prop: "goodsName",
                         search: true,
                         type: 'select',
                         filterable: true,
-                        multiple: true,
-                        tags: true,
+                        remote: true,
                         dataType: 'string',
-                        dicUrl: '/api/blade-los/bfees/listAll',
+                        dicUrl: '/api/blade-los/bcommodity/list?cnName={{key}}',
                         overHidden: true,
                         props: {
                             label: "cnName",
-                            value: "cnName"
+                            value: "cnName",
+                            res:'data.records'
                         },
                     },
                     {
                         label: "仓库",
-                        prop: "amount",
+                        prop: "warehouseName",
                         search: true,
                         overHidden: true,
                     },
                     {
                         label: "入库件数",
-                        prop: "amount",
+                        prop: "quantity",
                         overHidden: true,
                     },
                     {
                         label: "入库净重",
-                        prop: "amount",
+                        prop: "netWeight",
                         overHidden: true,
                     },
                     {
                         label: "入库毛重",
-                        prop: "amount",
+                        prop: "grossWeight",
                         overHidden: true,
                     },
                     {
                         label: "出库件数",
-                        prop: "amount",
+                        prop: "outQuantity",
                         overHidden: true,
                     },
                     {
                         label: "出库净重",
-                        prop: "amount",
+                        prop: "outNetWeight",
                         overHidden: true,
                     },
                     {
                         label: "出库毛重",
-                        prop: "amount",
+                        prop: "outWeight",
                         overHidden: true,
                     },
                     {
                         label: "结余件数",
-                        prop: "amount",
+                        prop: "surplusQuantity",
                         overHidden: true,
                     },
                     {
                         label: "结余净重",
-                        prop: "amount",
+                        prop: "surplusNetWeight",
                         overHidden: true,
                     },
                     {
                         label: "结余毛重",
-                        prop: "amount",
+                        prop: "surplusWeight",
                         overHidden: true,
                     },
                     {
                         label: "结余金额",
-                        prop: "amount",
+                        prop: "surplusGoodsAmount",
                         overHidden: true,
                     },
                     {
@@ -198,7 +197,7 @@ export default {
                     },
                     {
                         label: "显示0库存",
-                        prop: "remarks",
+                        prop: "inventory",
                         search: true,
                         overHidden: true,
                         hide:true,
@@ -215,56 +214,56 @@ export default {
                 menu: false,
                 height: '90',
                 column: [
-                    {
+                {
                         label: "入库件数",
-                        prop: "amount",
+                        prop: "quantity",
                         overHidden: true,
                     },
                     {
                         label: "入库净重",
-                        prop: "amount",
+                        prop: "netWeight",
                         overHidden: true,
                     },
                     {
                         label: "入库毛重",
-                        prop: "amount",
+                        prop: "grossWeight",
                         overHidden: true,
                     },
                     {
                         label: "出库件数",
-                        prop: "amount",
+                        prop: "outQuantity",
                         overHidden: true,
                     },
                     {
                         label: "出库净重",
-                        prop: "amount",
+                        prop: "outNetWeight",
                         overHidden: true,
                     },
                     {
                         label: "出库毛重",
-                        prop: "amount",
+                        prop: "outWeight",
                         overHidden: true,
                     },
                     {
                         label: "结余件数",
-                        prop: "amount",
+                        prop: "surplusQuantity",
                         overHidden: true,
                     },
                     {
                         label: "结余净重",
-                        prop: "amount",
+                        prop: "surplusNetWeight",
                         overHidden: true,
                     },
                     {
                         label: "结余毛重",
-                        prop: "amount",
+                        prop: "surplusWeight",
                         overHidden: true,
                     },
                     {
                         label: "结余金额",
-                        prop: "amount",
+                        prop: "surplusGoodsAmount",
                         overHidden: true,
-                    }
+                    },
                 ]
             },
         };

src/views/iosBasicData/losbfeestemplate/feesTemplateItems.vue

@@ -26,8 +26,8 @@
                             :class="{ isShow: item.display }">
                             <el-form-item :label="item.label" :prop="item.prop" :rules="item.rules">
                                 <el-select v-if="item.type == 'select'" v-model="form[item.prop]"
-                                    :placeholder="'请选择' + item.label" clearable filterable style="width: 100%" size="small"
-                                    :disabled="item.disabled || detailData.seeDisabled">
+                                    :placeholder="'请选择' + item.label" clearable filterable style="width: 100%"
+                                    size="small" :disabled="item.disabled || detailData.seeDisabled">
                                     <el-option v-for="(ite, inde) in item.dicData" :key="inde" :label="ite.label"
                                         :value="ite.value"></el-option>
                                 </el-select>
@@ -35,9 +35,9 @@
                                     v-model.trim="form[item.prop]" size="small" autocomplete="off"
                                     :disabled="item.disabled || detailData.seeDisabled"
                                     :placeholder="'请输入' + item.label"></el-input>
-                                <el-input v-else type="age" style="width: 100%;" v-model.trim="form[item.prop]" size="small"
-                                    autocomplete="off" :disabled="item.disabled || detailData.seeDisabled" clearable
-                                    :placeholder="'请输入' + item.label"></el-input>
+                                <el-input v-else type="age" style="width: 100%;" v-model.trim="form[item.prop]"
+                                    size="small" autocomplete="off" :disabled="item.disabled || detailData.seeDisabled"
+                                    clearable :placeholder="'请输入' + item.label"></el-input>
                             </el-form-item>
                         </el-col>
                     </el-row>
@@ -157,7 +157,8 @@
                                         @remoteMethod="bfeesListfun" @corpChange="feeCorpChange"
                                         @eldialogConfirm="eldialogConfirm(item.prop)">
                                         <bfeesdefine ref="bfeesdefine" :eldialog="true"
-                                            @selectionChange="eldialogMultipleChoice($event, 'feeCnName')"></bfeesdefine>
+                                            @selectionChange="eldialogMultipleChoice($event, 'feeCnName')">
+                                        </bfeesdefine>
                                     </search-query>
                                 </div>
                                 <div v-else-if="item.prop == 'quantityRule'">
@@ -192,9 +193,9 @@
                                 <el-input type="textarea" v-else-if="item.type === 'textarea'"
                                     v-model.trim="feestemplateForm[item.prop]" size="small" autocomplete="off"
                                     :disabled="item.disabled" :placeholder="'请输入' + item.label"></el-input>
-                                <el-input v-else type="age" style="width: 100%;" v-model.trim="feestemplateForm[item.prop]"
-                                    size="small" autocomplete="off" :disabled="item.disabled" clearable
-                                    :placeholder="'请输入' + item.label"></el-input>
+                                <el-input v-else type="age" style="width: 100%;"
+                                    v-model.trim="feestemplateForm[item.prop]" size="small" autocomplete="off"
+                                    :disabled="item.disabled" clearable :placeholder="'请输入' + item.label"></el-input>
                             </el-form-item>
                         </el-col>
                     </el-row>
@@ -254,7 +255,7 @@ export default {
 
             // 获取到的数据
             form: {
-                isShared:'1',
+                isShared: '1',
                 status: 0,
                 feesTemplateItemsList: []
             },
@@ -484,7 +485,7 @@ export default {
     },
     methods: {
         copyItem(index, row) {
-            let item=this.deepClone(row)
+            let item = this.deepClone(row)
             item.id = null;
             item.pid = null;
             this.feestemplateForm = item
@@ -615,6 +616,7 @@ export default {
         },
         // 查找弹窗里选择导出
         eldialogConfirm(name) {
+            console.log(name)
             if (name == 'corpCnName') {
                 if (this.$refs.bcorps[0].isShow) {
                     console.log('列表确认')
@@ -640,14 +642,15 @@ export default {
                 this.$set(this.feestemplateForm, 'elementsCode', this.$refs.bfeesdefine[0].selectionList[0].elementsCode)
                 this.$set(this.feestemplateForm, 'elementsEnName', this.$refs.bfeesdefine[0].selectionList[0].elementsEnName)
                 this.$refs.SearchFee[0].corpVisible = false
-            } else if (name == 'bunits') {
+            } else if (name == 'unitNo') {
                 this.$set(this.feestemplateForm, 'unitId', this.$refs.bunits[0].selectionList[0].id)
                 this.$set(this.feestemplateForm, 'unitNo', this.$refs.bunits[0].selectionList[0].code)
                 this.$refs.SearchUnitNo[0].corpVisible = false
-            } else { }
+            }
         },
         // 下拉多选弹窗数据多选回调
         eldialogMultipleChoice(list, name) {
+            console.log(list, name)
             let arr = []
             if (list.length > 1) {
                 this.$refs[name][0].$refs.crud.toggleSelection() // 先清空所以选择的数据
@@ -663,8 +666,9 @@ export default {
             this.pageLoading = true
             losbfeestemplateDetail(id).then(res => {
                 this.form = res.data.data;
+            }).finally(() => {
                 this.pageLoading = false
-            });
+            })
         },
         // 编辑按钮更改状态
         editHandle() {
@@ -674,7 +678,6 @@ export default {
         editCustomer() {
             this.$refs.form.validate((valid) => {
                 if (valid) {
-                    this.saveLoading = true
                     this.losbfeestemplateSubmitfun()
                 } else {
                     return false;
@@ -683,24 +686,26 @@ export default {
         },
         // 保存接口
         losbfeestemplateSubmitfun() {
+            this.saveLoading = true
             losbfeestemplateSubmit(this.form).then((res) => {
                 this.$message({
                     type: "success",
                     message: "操作成功!"
                 });
-                this.saveLoading = false
                 this.losbfeestemplateDetailfun(res.data.data.id)
                 this.detailData.seeDisabled = true;
+            }).finally(() => {
+                this.saveLoading = false;
             })
         },
 
         // 费用详细添加
         feestemplatepingCompanyAdd() {
             this.feestemplateForm = {
-                quantity:1,
-                price:1,
-                curCode:'CNY',
-                unitNo:'KGS'
+                quantity: 1,
+                price: 1,
+                curCode: 'CNY',
+                unitNo: 'KGS'
             }
             this.feestemplateVisible = true
         },

src/views/iosBasicData/paymentDetail/index.vue

@@ -375,6 +375,14 @@ export default {
     },
     async created() {
         this.option = await this.getColumnData(this.getColumnName(333), this.optionBack);
+        this.query = {
+            dc: 'D',
+            isBusinessDate: 1,
+            isToExamineDate: 0,
+            type: '1',
+            etdStart: defaultDate3()[0],
+            etdEnd: defaultDate3()[1],
+        }
     },
     methods: {
         // 导出

src/views/iosBasicData/storageFeeF/detailsPage.vue

@@ -7,8 +7,17 @@
                 </el-button>
             </div>
             <div class="add-customer-btn">
-                <el-button class="el-button--small-yh" style="margin-left: 6px;" type="primary" size="small"
-                    @click="submit">保 存
+                <el-button v-if="editButton" class="el-button--small-yh" style="margin-left: 6px;" type="primary"
+                    size="small" @click="inEdit">编 辑
+                </el-button>
+                <el-button v-if="!editButton" class="el-button--small-yh" style="margin-left: 6px;" type="primary"
+                    size="small" @click="submit" :disabled="form.status == '已生成'">保 存
+                </el-button>
+                <el-button v-if="form.id && form.status == '录入'" class="el-button--small-yh" style="margin-left: 6px;"
+                    type="success" size="small" @click="confirm" :disabled="editButton">确认生成仓储费
+                </el-button>
+                <el-button v-if="form.id && form.status == '已生成'" class="el-button--small-yh" style="margin-left: 6px;"
+                    type="danger" size="small" @click="revokeConfirm" :disabled="editButton">撤销生成仓储费
                 </el-button>
             </div>
         </div>
@@ -18,25 +27,27 @@
                     <template slot="warehouseName" slot-scope="{ row }">
                         <dic-select v-model="form.warehouseName" placeholder="仓库" key="id" label="cname"
                             url="/blade-los/storage/list" res="records" :filterable="true" :remote="true"
-                            dataName="cname" @selectChange="dicChange('warehouseName', $event)"></dic-select>
+                            dataName="cname" @selectChange="dicChange('warehouseName', $event)"
+                            :disabled="optionForm.disabled"></dic-select>
                     </template>
                 </avue-form>
             </trade-card>
             <trade-card title="仓储费明细">
                 <avue-crud :option="option" :data="form.storageFeesItemsList" id="out-table" ref="crud"
-                    @selection-change="selectionChange" @resetColumn="resetColumn('crud', 'option', 'optionBack', 443)"
+                    @resetColumn="resetColumn('crud', 'option', 'optionBack', 443)"
                     @saveColumn="saveColumn('crud', 'option', 'optionBack', 443)">
                     <template slot="menuLeft">
-                        <!-- <el-button type="primary" size="small" icon="el-icon-plus" @click="addRow">新 增
-                        </el-button> -->
+                        <el-button type="primary" size="small" @click="addRow"
+                            :disabled="editButton || form.status == '已生成'||form.storageFeesItemsList.length>0">计算仓储费
+                        </el-button>
                     </template>
                     <template slot="menu" slot-scope="{ row, index }">
                         <!-- <el-button size="small" icon="el-icon-edit" type="text"
                             @click="inEdit(row)">{{ row.$cellEdit ?
                                 "保存" :
                                 "编辑" }}</el-button> -->
-                        <el-button size="small" icon="el-icon-delete" type="text"
-                            @click="rowDel(row, index)">删除</el-button>
+                        <el-button size="small" icon="el-icon-delete" type="text" @click="rowDel(row, index)"
+                            :disabled="editButton || form.status == '已生成'">删除</el-button>
                     </template>
                 </avue-crud>
             </trade-card>
@@ -45,7 +56,7 @@
 </template>
 
 <script>
-import { submit, getDetail, itemRemove } from "@/api/iosBasicData/storageFeeF";
+import { submit, getDetail, itemRemove, calculateStorageFees, confirmSettlement, revokeSettlement } from "@/api/iosBasicData/storageFeeF";
 import dicSelect from "@/components/dicSelect/main";
 
 import { bfeesList } from "@/api/iosBasicData/bfees";
@@ -55,12 +66,13 @@ export default {
 
     data() {
         return {
+            editButton: false,
             form: {
-                status: '0',
                 storageFeesItemsList: []
             },
             optionForm: {
                 menuBtn: false,
+                disabled: false,
                 span: 8,
                 column: [
                     {
@@ -68,26 +80,26 @@ export default {
                         prop: "warehouseName",
                         disabled: false,
                     },
-                    {
-                        label: "计费起始时间",
-                        prop: "chargingStartDate",
-                        type: "date",
-                        format: "yyyy-MM-dd",
-                        valueFormat: "yyyy-MM-dd 00:00:00",
-                        disabled: false,
-                    },
+                    // {
+                    //     label: "计费起始时间",
+                    //     prop: "chargingStartDate",
+                    //     type: "date",
+                    //     format: "yyyy-MM-dd",
+                    //     valueFormat: "yyyy-MM-dd 00:00:00",
+                    //     disabled: false,
+                    // },
                     {
                         label: "计费结束时间",
                         prop: "chargingEndDate",
                         type: "date",
                         format: "yyyy-MM-dd",
-                        valueFormat: "yyyy-MM-dd 23:59:59",
+                        valueFormat: "yyyy-MM-dd 00:00:00",
                         disabled: false,
                     },
                     {
                         label: "合计金额",
                         prop: "amount",
-                        disabled: false,
+                        disabled: true,
                     },
                     {
                         label: '备注',
@@ -198,24 +210,41 @@ export default {
     async created() {
         this.option = await this.getColumnData(this.getColumnName(443), this.optionBack);
         if (this.detailData.id) {
+            this.editButton = true
+            this.optionForm.disabled = true
             this.getDetails(this.detailData.id)
         }
     },
     methods: {
         addRow() {
-            this.form.storageFeesItemsList.push({
-                $cellEdit: true,
+            if (!this.form.warehouseId) return this.$message.error("请选择仓库!");
+            if (!this.form.chargingEndDate) return this.$message.error("请选择计费时间!");
+            let obj = {}
+            obj = {
+                warehouseId: this.form.warehouseId,
+                warehouseName: this.form.warehouseName,
+                chargingStartDate: this.form.chargingStartDate,
+                chargingEndDate: this.form.chargingEndDate,
+            }
+            const loading = this.$loading({
+                lock: true,
+                text: '加载中',
+                spinner: 'el-icon-loading',
+                background: 'rgba(255,255,255,0.7)'
+            });
+            calculateStorageFees(obj).then(res => {
+                this.form.storageFeesItemsList = res.data.data
+                this.$refs.crud.dicInit();
+            }).finally(() => {
+                loading.close()
             })
         },
         // 编辑
-        inEdit(row) {
-            if (row.$cellEdit == true) {
-                // if (!row.overpayment || row.overpaymentType == null) return this.$message.error("请完善明细信息");
-                this.$set(row, '$cellEdit', false)
-            } else {
-                this.$set(row, '$cellEdit', true)
+        inEdit() {
+            this.editButton = false
+            if (this.form.status != '已生成') {
+                this.optionForm.disabled = false
             }
-
         },
         dicChange(name, row) {
             if (name == 'warehouseName') {
@@ -225,15 +254,6 @@ export default {
                     this.form.warehouseId = null
                 }
             }
-            // if (name == 'advancePaymentBalance') {
-            //     row.inOverpayment = _.add(Number(row.advancePaymentBalance ? row.advancePaymentBalance : 0), Number(row.outOverpaymen ? row.outOverpaymen : 0))
-            // }
-            // if (name == 'inOverpayment') {
-            //     row.advancePaymentBalance = _.subtract(Number(row.inOverpayment ? row.inOverpayment : 0), Number(row.outOverpaymen ? row.outOverpaymen : 0))
-            // }
-            // if (name == 'outOverpaymen') {
-            //     row.inOverpayment = _.add(Number(row.advancePaymentBalance ? row.advancePaymentBalance : 0), Number(row.outOverpaymen ? row.outOverpaymen : 0))
-            // }
         },
         getDetails(id) {
             const loading = this.$loading({
@@ -278,6 +298,51 @@ export default {
                 }
             });
         },
+        confirm() {
+            if (this.form.storageFeesItemsList.length == 0) return this.$message.success("明细没有数据");
+            this.$confirm('是否确认生成仓储费?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                const loading = this.$loading({
+                    lock: true,
+                    text: '加载中',
+                    spinner: 'el-icon-loading',
+                    background: 'rgba(255,255,255,0.7)'
+                });
+                confirmSettlement(this.form).then(res => {
+                    this.$message.success("操作成功");
+                    this.getDetails(res.data.data.id)
+                    this.optionForm.disabled = true
+                }).finally(() => {
+                    loading.close();
+                })
+            })
+
+        },
+        revokeConfirm() {
+            this.$confirm('是否撤销生成仓储费?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                const loading = this.$loading({
+                    lock: true,
+                    text: '加载中',
+                    spinner: 'el-icon-loading',
+                    background: 'rgba(255,255,255,0.7)'
+                });
+                revokeSettlement(this.form).then(res => {
+                    this.$message.success("操作成功");
+                    this.getDetails(res.data.data.id)
+                    this.optionForm.disabled = false
+                }).finally(() => {
+                    loading.close();
+                })
+            })
+
+        },
         rowDel(row, index) {
             this.$confirm("确定将选择数据删除?", {
                 confirmButtonText: "确定",

src/views/iosBasicData/storageFeeF/index.vue

@@ -11,18 +11,12 @@
                     <el-button type="primary" size="small" icon="el-icon-plus" @click="addButton">新 增
                     </el-button>
                 </template>
-                <tempalte slot="advancePaymentBalance" slot-scope="{ row }">
-                    <el-input-number v-if="row.$cellEdit" v-model="row.advancePaymentBalance" @change="countChange(row)"
-                        :controls="false" placeholder="请输入 单价" size="small" style="width: 100%;"></el-input-number>
-                    <span v-else>{{ row.advancePaymentBalance }}</span>
-                </tempalte>
                 <template slot="menu" slot-scope="{ row, index }">
-                    <el-button size="small" icon="el-icon-edit" type="text" @click="inEdit(row)">{{ row.$cellEdit ? "保存"
-                        :
-                        "编辑" }}</el-button>
+                    <el-button size="small" icon="el-icon-edit" type="text" @click="rowEdit(row)">编辑</el-button>
+                    <el-button size="small" icon="el-icon-delete" type="text" @click="rowDel(row)" :disabled="row.status == '已生成'">删除</el-button>
                 </template>
-                <template slot="corpName" slot-scope="{ row }">
-                    <span style="color: #1e9fff" @click="rowEdit(row)">{{ row.corpName }}</span>
+                <template slot="warehouseName" slot-scope="{ row }">
+                    <span style="color: #1e9fff" @click="rowEdit(row)">{{ row.warehouseName }}</span>
                 </template>
             </avue-crud>
         </basic-container>
@@ -56,7 +50,7 @@ export default {
                 menuWidth: 120,
                 searchLabelWidth: 100,
                 searchShow: true,
-                searchMenuSpan: 6,
+                searchMenuSpan: 12,
                 border: true,
                 index: true,
                 addBtn: false,
@@ -66,31 +60,6 @@ export default {
                 searchIcon: true,
                 searchIndex: 3,
                 column: [
-                    // {
-                    //     label: "客户名称",
-                    //     prop: "corpId",
-                    //     width: "200",
-                    //     overHidden: true,
-                    //     search: true,
-                    //     type: 'select',
-                    //     filterable: true,
-                    //     remote: true,
-                    //     dicUrl: "/api/blade-los/bcorps/listByType?cnName={{key}}",
-                    //     props: {
-                    //         label: 'cnName',
-                    //         value: 'id',
-                    //         res: 'data.records'
-                    //     },
-                    //     hide: true,
-                    //     showColumn: false,
-                    //     searchOrder: 1,
-                    // },
-                    // {
-                    //     label: "客户名称",
-                    //     prop: "corpName",
-                    //     width: "200",
-                    //     overHidden: true,
-                    // },
                     {
                         label: "仓库",
                         prop: "warehouseName",
@@ -106,27 +75,32 @@ export default {
                         },
                         overHidden: true,
                     },
+                    // {
+                    //     label: "计费起始时间",
+                    //     prop: "chargingStartDate",
+                    //     search: true,
+                    //     type: "date",
+                    //     format: "yyyy-MM-dd",
+                    //     valueFormat: "yyyy-MM-dd 00:00:00",
+                    //     overHidden: true
+                    // },
                     {
-                        label: "计费起始时间",
-                        prop: "inOverpayment",
+                        label: "计费结束时间",
+                        prop: "chargingEndDate",
                         search: true,
                         type: "date",
                         format: "yyyy-MM-dd",
-                        valueFormat: "yyyy-MM-dd",
+                        valueFormat: "yyyy-MM-dd 00:00:00",
                         overHidden: true
                     },
                     {
-                        label: "计费结束时间",
-                        prop: "outOverpaymen",
-                        search: true,
-                        type: "date",
-                        format: "yyyy-MM-dd",
-                        valueFormat: "yyyy-MM-dd",
+                        label: "合计金额",
+                        prop: "amount",
                         overHidden: true
                     },
                     {
-                        label: "合计金额",
-                        prop: "outOverpaymen",
+                        label: "状态",
+                        prop: "status",
                         overHidden: true
                     },
                     {
@@ -162,7 +136,7 @@ export default {
             this.isShow = false
         },
         rowDel(row) {
-            if (row.status == 1) {
+            if (row.status != '已生成') {
                 this.$confirm("确定将选择数据删除?", {
                     confirmButtonText: "确定",
                     cancelButtonText: "取消",
@@ -204,9 +178,6 @@ export default {
             }
 
         },
-        countChange(row) {
-            row.inOverpayment = _.add(Number(row.advancePaymentBalance ? row.advancePaymentBalance : 0), Number(row.outOverpaymen ? row.outOverpaymen : 0))
-        },
         searchReset() {
             this.query = this.$options.data().query;
             this.onLoad(this.page);
@@ -234,7 +205,6 @@ export default {
             obj = {
                 ...Object.assign(params, this.query),
             }
-            console.log(obj)
             this.loading = true;
             getList(page.currentPage, page.pageSize, obj).then(res => {
                 this.data = res.data.data.records;

src/views/tirePartsMall/purchaseService/outStorage/detailsPage.vue

@@ -44,9 +44,9 @@
                 <!--  :icon="row.$cellEdit ? 'el-icon-plus' : 'el-icon-edit'" @click="rowEdit(row, index)">编辑-->
                 <!--</el-button>-->
                 <el-button :size="size" :disabled="disabled || isDisabled" :type="type"
-                             :icon="row.$cellEdit ? 'el-icon-plus' : 'el-icon-edit'" @click="rowEdit(row, index)">
-                      {{row.$cellEdit?'保存':'编辑'}}
-                  </el-button>
+                  :icon="row.$cellEdit ? 'el-icon-plus' : 'el-icon-edit'" @click="rowEdit(row, index)">
+                  {{ row.$cellEdit ? '保存' : '编辑' }}
+                </el-button>
                 <el-button icon="el-icon-delete" :size="size"
                   :disabled="disabled || isDisabled || form.statusName == '已出库'" :type="type"
                   @click="rowDelBox(row, index)">删除
@@ -280,20 +280,24 @@ export default {
             name: 'sendNum',
             type: 'sum',
           }],
-        column: [{
-          label: '商品名称',
-          prop: 'goodsId',
-          disabled: true,
-          width: 200,
-          overHidden: true,
-          hide: true,
-          type: 'select',
-          props: {
-            label: 'cname',
-            value: 'id'
-          },
-          dicUrl: '/api/blade-sales-part/goodsDesc/goodsListAll'
-        }, {
+        column: [
+        //   {
+        //   label: '商品名称',
+        //   prop: 'goodsId',
+        //   disabled: true,
+        //   width: 200,
+        //   overHidden: true,
+        //   hide: true,
+        //   type: 'select',
+        //   filterable: true,
+        //   remote: true,
+        //   props: {
+        //     label: 'cname',
+        //     value: 'id'
+        //   },
+        //   dicUrl: '/api/blade-sales-part/goodsDesc/list?current=1&size=10&cname={{key}}&enableOrNot=1'
+        // },
+         {
           label: '商品名称',
           prop: 'goodsName',
           disabled: true,

src/views/tirePartsMall/purchasingManagement/financingProcurement/detailsPage.vue

@@ -109,13 +109,13 @@
                             @resetColumn="resetColumnTwo('formContacts', 'optionContacts', 'optionContactsBack', 269.1)"
                             @saveColumn="saveColumnTwo('formContacts', 'optionContacts', 'optionContactsBack', 269.1)">
                             <template slot-scope="{scope,row}" slot="menuLeft">
-                                <el-button type="primary" icon="el-icon-plus" size="small" :disabled="isAddBtn||form.status != '录入'"
-                                    @click="rowAdd(row)">添加商品</el-button>
-                                <el-button type="success" size="small" :disabled="isAddBtn||form.status != '录入'" icon="el-icon-bottom"
-                                    @click="excelDialogfun('名称')">按名称导入
+                                <el-button type="primary" icon="el-icon-plus" size="small"
+                                    :disabled="isAddBtn || form.status != '录入'" @click="rowAdd(row)">添加商品</el-button>
+                                <el-button type="success" size="small" :disabled="isAddBtn || form.status != '录入'"
+                                    icon="el-icon-bottom" @click="excelDialogfun('名称')">按名称导入
                                 </el-button>
-                                <el-button type="success" size="small" :disabled="isAddBtn||form.status != '录入'" icon="el-icon-bottom"
-                                    @click="excelDialogfun('code')">按Code导入
+                                <el-button type="success" size="small" :disabled="isAddBtn || form.status != '录入'"
+                                    icon="el-icon-bottom" @click="excelDialogfun('code')">按Code导入
                                 </el-button>
                                 <el-button type="primary" icon="el-icon-printer" size="small"
                                     @click="handlePrint">打印</el-button>
@@ -126,8 +126,8 @@
                                 <span>{{ row.goodsName }}</span>
                             </template>
                             <template slot="goodsNum" slot-scope="{ row }">
-                                <el-input-number v-if="!mingxibaocun" size="small" v-model="row.goodsNum" :controls="false" :precision="numberDecimal"
-                                    style="width: 100%"></el-input-number>
+                                <el-input-number v-if="!mingxibaocun" size="small" v-model="row.goodsNum"
+                                    :controls="false" :precision="numberDecimal" style="width: 100%"></el-input-number>
                                 <span v-else>{{ row.goodsNum }}</span>
                             </template>
                             <template slot="price" slot-scope="{ row }">
@@ -276,7 +276,8 @@
                     <div>
                         <el-scrollbar>
                             <basic-container>
-                                <avue-tree  style="height: 70vh;overflow-y: auto" :option="treeOption" :data="treeDataGoods" @node-click="nodeClick" />
+                                <avue-tree style="height: 70vh;overflow-y: auto" :option="treeOption"
+                                    :data="treeDataGoods" @node-click="nodeClick" />
                             </basic-container>
                         </el-scrollbar>
                     </div>
@@ -294,8 +295,8 @@
                                 </el-tabs>
                             </template>
                             <template slot="goodsNum" slot-scope="{row}">
-                                <el-input-number v-model="row.goodsNum" size="small" :controls="false" :precision="numberDecimal"
-                                    @input="amountChange($event, row)" style="width: 100%" />
+                                <el-input-number v-model="row.goodsNum" size="small" :controls="false"
+                                    :precision="numberDecimal" @input="amountChange($event, row)" style="width: 100%" />
                             </template>
 
                             <template slot="dot" slot-scope="{row}">
@@ -382,7 +383,7 @@ export default {
 
     data() {
         return {
-            numberDecimal:0,
+            numberDecimal: 0,
             SelectSearch: {},
             // 编辑还是保存
             mingxibaocun: true,
@@ -504,7 +505,7 @@ export default {
             templateUrl: '/api/blade-sales-part/ship/export-item', // 模板url
             form: {
                 whetherFinancing: '1',
-                status:'录入',
+                status: '录入',
                 orderItemsList: [],
                 paymentRecordsList: [],
                 outboundRecordsList: []
@@ -827,6 +828,7 @@ export default {
                         prop: 'goodsId',
                         width: 200,
                         disabled: false,
+                        filterable: true,
                         remote: true,
                         hide: true,
                         overHidden: true,
@@ -1369,7 +1371,7 @@ export default {
         //     this.getDetailsfun()
         // }
         isProcurement({ "param": "number.decimal" }).then(res => {
-            this.numberDecimal = res.data.data?Number(res.data.data):0
+            this.numberDecimal = res.data.data ? Number(res.data.data) : 0
         })
     },
 

src/views/tirePartsMall/purchasingManagement/warehouseEntryOrder/detailsPage.vue

@@ -356,21 +356,24 @@ export default {
                         type: 'sum',
                     }
                 ],
-                column: [{
+                column: [
+                    {
                     label: '商品名称',
                     prop: 'goodsId',
                     width: 200,
                     overHidden: true,
-                    disabled: false,
-                    filterable: true,
-                    hide: true,
-                    type: 'select',
-                    props: {
-                        label: 'cname',
-                        value: 'id'
-                    },
-                    dicUrl: '/api/blade-sales-part/goodsDesc/goodsListAll'
-                }, {
+                    // disabled: false,
+                    // filterable: true,
+                    // remote: true,
+                    // hide: true,
+                    // type: 'select',
+                    // props: {
+                    //     label: 'cname',
+                    //     value: 'id'
+                    // },
+                    // dicUrl: '/api/blade-sales-part/goodsDesc/list?current=1&size=10&cname={{key}}&enableOrNot=1'
+                }, 
+                {
                     label: '商品名称',
                     prop: 'goodsName',
                     width: 200,

src/views/tirePartsMall/salesManagement/Inventory/detailsPage.vue

@@ -51,13 +51,15 @@
                                 row.sendNum }}</span>
                     </template>
                     <template slot="sendNumFinancing" slot-scope="{row}">
-                        <el-input-number v-if="!mingxibaocun&& whetherFinancing == 1" v-model="row.sendNumFinancing" size="small"
-                            :controls="false" :precision="0" style="width: 100%" @change="calculator(row)" />
+                        <el-input-number v-if="!mingxibaocun && whetherFinancing == 1" v-model="row.sendNumFinancing"
+                            size="small" :controls="false" :precision="0" style="width: 100%"
+                            @change="calculator(row)" />
                         <span v-else>{{ row.sendNumFinancing }}</span>
                     </template>
                     <template slot="sendNumHave" slot-scope="{row}">
-                        <el-input-number v-if="!mingxibaocun&& whetherFinancing == 1" v-model="row.sendNumHave" size="small" :controls="false"
-                            :precision="0" style="width: 100%" @change="calculator(row)" />
+                        <el-input-number v-if="!mingxibaocun && whetherFinancing == 1" v-model="row.sendNumHave"
+                            size="small" :controls="false" :precision="0" style="width: 100%"
+                            @change="calculator(row)" />
                         <span v-else>{{ row.sendNumHave }}</span>
                     </template>
                     <template slot="profitLossNum" slot-scope="{ row }">
@@ -570,189 +572,192 @@ export default {
                     type: "sum",
                     decimals: 2
                 }],
-                column: [{
-                    label: '商品名称',
-                    prop: 'goodsId',
-                    width: 200,
-                    disabled: false,
-                    remote: true,
-                    hide: true,
-                    overHidden: true,
-                    type: 'select',
-                    // dicData: [],
-                    props: {
-                        label: 'cname',
-                        value: 'id'
-                    },
-                    // dicUrl: '/api/blade-sales-part/goodsDesc/goodsListAll?cname={{key}}'
-                    dicUrl: "/api/blade-sales-part/goodsDesc/goodsListAll?cname={{key}}&enableOrNot=1"
-                    // dicUrl: "/api/blade-sales-part/goodsDesc/goodsListXs?cname={{key}}"
-                }, {
-                    label: '商品名称',
-                    prop: 'goodsName',
-                    width: 200,
-                    disabled: false,
-                    remote: true,
-                    overHidden: true,
-                }, {
-                    label: '商品编码',
-                    prop: 'goodsNo',
-                    overHidden: true,
-                    disabled: false,
-                    width: 100
-                }, {
-                    label: '花纹',
-                    prop: 'pattern',
-                    overHidden: true,
-                    disabled: false,
-                    width: 100
-                }, {
-                    label: '批次号',
-                    prop: 'dot',
-                    cell: true,
-                    width: 120,
-                    type: "select",
-                    disabled: true,
-                    allowCreate: true,
-                    filterable: true,
-                    dicData: [],
-                    props: {
-                        label: "dot",
-                        value: "dot"
-                    },
-                    dicUrl: "/api/blade-sales-part/stockDesc/dotList",
-                    overHidden: true,
-                }, {
-                    label: '库存单价',
-                    prop: 'costprie',
-                    overHidden: true,
-                    width: 100,
-                    disabled: false,
-                }, {
-                    label: '账面数量',
-                    prop: 'inventory',
-                    overHidden: true,
-                    disabled: false,
-                    width: 100,
-                },
-                {
-                    label: '参考库存融资',
-                    prop: "inventoryFinancing",
-                    width: 120,
-                    disabled: true,
-                    hide: true,
-                    showColumn: false,
-                },
-                {
-                    label: '参考库存自有',
-                    prop: "inventoryHave",
-                    width: 120,
-                    disabled: true,
-                    hide: true,
-                    showColumn: false,
-                },
-                {
-                    label: '账面金额',
-                    prop: 'price',
-                    overHidden: true,
-                    width: 100,
-                    disabled: false,
-                    cell: true,
-                    rules: [{
-                        required: true,
-                        message: " ",
-                        trigger: "blur"
+                column: [
+                    // {
+                    //     label: '商品名称',
+                    //     prop: 'goodsId',
+                    //     width: 200,
+                    //     disabled: false,
+                    //     filterable: true,
+                    //     remote: true,
+                    //     hide: true,
+                    //     overHidden: true,
+                    //     type: 'select',
+                    //     // dicData: [],
+                    //     props: {
+                    //         label: 'cname',
+                    //         value: 'id'
+                    //     },
+                    //     // dicUrl: '/api/blade-sales-part/goodsDesc/goodsListAll?cname={{key}}'
+                    //     dicUrl: "/api/blade-sales-part/goodsDesc/list?current=1&size=10&cname={{key}}&enableOrNot=1"
+                    //     // dicUrl: "/api/blade-sales-part/goodsDesc/goodsListXs?cname={{key}}"
+                    // }, 
+                    {
+                        label: '商品名称',
+                        prop: 'goodsName',
+                        width: 200,
+                        disabled: false,
+                        remote: true,
+                        overHidden: true,
                     }, {
-                        validator: (rule, value, callback) => {
-                            if (value < 0) {
-                                callback(new Error("价格不能小于0"));
-                            } else {
-                                callback();
-                            }
-                        },
-                        trigger: "blur"
-                    }]
-                },
-                {
-                    label: '实际数量',
-                    prop: 'sendNum',
-                    overHidden: true,
-                    disabled: false,
-                    cell: true,
-                    width: 100,
-                    rules: [{
-                        required: true,
-                        message: " ",
-                        trigger: "blur"
+                        label: '商品编码',
+                        prop: 'goodsNo',
+                        overHidden: true,
+                        disabled: false,
+                        width: 100
                     }, {
-                        validator: (rule, value, callback) => {
-                            console.log(this.formContacts.inventory);
-                            if (value < 0) {
-                                callback(new Error("数量不能小于0"));
-                            } else {
-                                callback();
-                            }
-                        },
-                        trigger: "blur"
-                    }]
-                },
-                {
-                    label: '融资数量',
-                    prop: 'sendNumFinancing',
-                    disabled: false,
-                    hide: true,
-                    showColumn: false,
-                },
-                {
-                    label: '自有数量',
-                    prop: 'sendNumHave',
-                    disabled: false,
-                    hide: true,
-                    showColumn: false,
-                },
-                {
-                    label: '实际金额',
-                    prop: 'subTotalMoney',
-                    overHidden: true,
-                    width: 100,
-                    disabled: false,
-                    cell: true,
-                    rules: [{
-                        required: true,
-                        message: " ",
-                        trigger: "blur"
+                        label: '花纹',
+                        prop: 'pattern',
+                        overHidden: true,
+                        disabled: false,
+                        width: 100
                     }, {
-                        validator: (rule, value, callback) => {
-                            if (value < 0) {
-                                callback(new Error("价格不能小于0"));
-                            } else {
-                                callback();
-                            }
+                        label: '批次号',
+                        prop: 'dot',
+                        cell: true,
+                        width: 120,
+                        type: "select",
+                        disabled: true,
+                        allowCreate: true,
+                        filterable: true,
+                        dicData: [],
+                        props: {
+                            label: "dot",
+                            value: "dot"
                         },
-                        trigger: "blur"
-                    }]
-                },
-                {
-                    label: '盈亏数量',
-                    prop: 'profitLossNum',
-                    overHidden: true,
-                    disabled: false,
-                    width: 100
-                },
-                {
-                    label: '盈亏金额',
-                    prop: 'profitLossAmount',
-                    overHidden: true,
-                    width: 100,
-                    disabled: false,
-                },
-                {
-                    label: '备注',
-                    prop: "remarks",
-                    overHidden: true,
-                    width: 100,
-                    disabled: false,
-                }
+                        dicUrl: "/api/blade-sales-part/stockDesc/dotList",
+                        overHidden: true,
+                    }, {
+                        label: '库存单价',
+                        prop: 'costprie',
+                        overHidden: true,
+                        width: 100,
+                        disabled: false,
+                    }, {
+                        label: '账面数量',
+                        prop: 'inventory',
+                        overHidden: true,
+                        disabled: false,
+                        width: 100,
+                    },
+                    {
+                        label: '参考库存融资',
+                        prop: "inventoryFinancing",
+                        width: 120,
+                        disabled: true,
+                        hide: true,
+                        showColumn: false,
+                    },
+                    {
+                        label: '参考库存自有',
+                        prop: "inventoryHave",
+                        width: 120,
+                        disabled: true,
+                        hide: true,
+                        showColumn: false,
+                    },
+                    {
+                        label: '账面金额',
+                        prop: 'price',
+                        overHidden: true,
+                        width: 100,
+                        disabled: false,
+                        cell: true,
+                        rules: [{
+                            required: true,
+                            message: " ",
+                            trigger: "blur"
+                        }, {
+                            validator: (rule, value, callback) => {
+                                if (value < 0) {
+                                    callback(new Error("价格不能小于0"));
+                                } else {
+                                    callback();
+                                }
+                            },
+                            trigger: "blur"
+                        }]
+                    },
+                    {
+                        label: '实际数量',
+                        prop: 'sendNum',
+                        overHidden: true,
+                        disabled: false,
+                        cell: true,
+                        width: 100,
+                        rules: [{
+                            required: true,
+                            message: " ",
+                            trigger: "blur"
+                        }, {
+                            validator: (rule, value, callback) => {
+                                console.log(this.formContacts.inventory);
+                                if (value < 0) {
+                                    callback(new Error("数量不能小于0"));
+                                } else {
+                                    callback();
+                                }
+                            },
+                            trigger: "blur"
+                        }]
+                    },
+                    {
+                        label: '融资数量',
+                        prop: 'sendNumFinancing',
+                        disabled: false,
+                        hide: true,
+                        showColumn: false,
+                    },
+                    {
+                        label: '自有数量',
+                        prop: 'sendNumHave',
+                        disabled: false,
+                        hide: true,
+                        showColumn: false,
+                    },
+                    {
+                        label: '实际金额',
+                        prop: 'subTotalMoney',
+                        overHidden: true,
+                        width: 100,
+                        disabled: false,
+                        cell: true,
+                        rules: [{
+                            required: true,
+                            message: " ",
+                            trigger: "blur"
+                        }, {
+                            validator: (rule, value, callback) => {
+                                if (value < 0) {
+                                    callback(new Error("价格不能小于0"));
+                                } else {
+                                    callback();
+                                }
+                            },
+                            trigger: "blur"
+                        }]
+                    },
+                    {
+                        label: '盈亏数量',
+                        prop: 'profitLossNum',
+                        overHidden: true,
+                        disabled: false,
+                        width: 100
+                    },
+                    {
+                        label: '盈亏金额',
+                        prop: 'profitLossAmount',
+                        overHidden: true,
+                        width: 100,
+                        disabled: false,
+                    },
+                    {
+                        label: '备注',
+                        prop: "remarks",
+                        overHidden: true,
+                        width: 100,
+                        disabled: false,
+                    }
                 ]
             },
         }
@@ -901,9 +906,9 @@ export default {
                     inventory: item.balanceQuantity, // 账面数量
                     inventoryFinancing: item.balanceQuantityFinancing,
                     inventoryHave: item.balanceQuantityHave,
-                    sendNum:0,
-                    sendNumFinancing:0,
-                    sendNumHave:0,
+                    sendNum: 0,
+                    sendNumFinancing: 0,
+                    sendNumHave: 0,
                     price: item.inventoryAmount, // 账面金额
                 })
             }
@@ -945,8 +950,8 @@ export default {
             }
             row.sendNum = Number(Number(row.sendNumFinancing) + Number(row.sendNumHave))
             row.subTotalMoney = row.sendNum * row.costprie
-            row.profitLossNum=Number(row.sendNum) - Number(row.inventory)
-            row.profitLossAmount=Number(row.subTotalMoney) - Number(row.price)
+            row.profitLossNum = Number(row.sendNum) - Number(row.inventory)
+            row.profitLossAmount = Number(row.subTotalMoney) - Number(row.price)
         },
         //表头编辑
         confirmEditing() {

src/views/tirePartsMall/salesManagement/outboundWorkOrder/detailsPage.vue

@@ -296,20 +296,23 @@ export default {
             name: 'sendNum',
             type: 'sum',
           }],
-        column: [{
-          label: '商品名称',
-          prop: 'goodsId',
-          disabled: true,
-          width: 200,
-          overHidden: true,
-          hide: true,
-          type: 'select',
-          props: {
-            label: 'cname',
-            value: 'id'
-          },
-          dicUrl: '/api/blade-sales-part/goodsDesc/goodsListAll'
-        }, {
+        column: [
+        //   {
+        //   label: '商品名称',
+        //   prop: 'goodsId',
+        //   disabled: true,
+        //   width: 200,
+        //   overHidden: true,
+        //   hide: true,
+        //   type: 'select',
+        //   remote: true,
+        //   props: {
+        //     label: 'cname',
+        //     value: 'id'
+        //   },
+        //   dicUrl: '/api/blade-sales-part/goodsDesc/list?current=1&size=10&cname={{key}}&enableOrNot=1'
+        // }, 
+        {
           label: '商品名称',
           prop: 'goodsName',
           disabled: true,

src/views/tirePartsMall/salesManagement/purchaseOrder/detailsPage.vue

@@ -1940,9 +1940,6 @@ export default {
                 spinner: 'el-icon-loading',
                 background: 'rgba(255,255,255,0.7)'
             })
-            goodsListAll().then(res => {
-                console.log();
-            })
             getDetails({ id: id }).then(res => {
                 this.form = res.data.data
                 let ordForm = { srcBillNo: this.form.ordNo }

src/views/tirePartsMall/salesManagement/saleOrder/detailsPage.vue

@@ -864,7 +864,8 @@ export default {
                     name: "returnsAmount",
                     type: "sum"
                 }],
-                column: [{
+                column: [
+                    {
                     label: '商品名称',
                     prop: 'goodsId',
                     width: 250,
@@ -881,7 +882,8 @@ export default {
                     // dicUrl: '/api/blade-sales-part/goodsDesc/goodsListAll?cname={{key}}'
                     dicUrl: `/api/blade-sales-part/goodsDesc/goodsListXs?cname={{key}}&customId=&enableOrNot=1&stock=${this.goodsId}`
                     // dicUrl: "/api/blade-sales-part/goodsDesc/goodsListXs?cname={{key}}"
-                }, {
+                }, 
+                {
                     label: '商品名称',
                     prop: 'goodsName',
                     width: 250,

src/views/tirePartsMall/salesService/inStorage/detailsPage.vue

@@ -351,21 +351,24 @@ export default {
                         type: 'sum',
                     }
                 ],
-                column: [{
-                    label: '商品名称',
-                    prop: 'goodsId',
-                    width: 200,
-                    overHidden: true,
-                    disabled: false,
-                    filterable: true,
-                    hide: true,
-                    type: 'select',
-                    props: {
-                        label: 'cname',
-                        value: 'id'
-                    },
-                    dicUrl: '/api/blade-sales-part/goodsDesc/goodsListAll'
-                }, {
+                column: [
+                //     {
+                //     label: '商品名称',
+                //     prop: 'goodsId',
+                //     width: 200,
+                //     overHidden: true,
+                //     disabled: false,
+                //     filterable: true,
+                //     remote: true,
+                //     hide: true,
+                //     type: 'select',
+                //     props: {
+                //         label: 'cname',
+                //         value: 'id'
+                //     },
+                //     dicUrl: '/api/blade-sales-part/goodsDesc/list?current=1&size=10&cname={{key}}&enableOrNot=1'
+                // }, 
+                {
                     label: '商品名称',
                     prop: 'goodsName',
                     width: 200,