君海禅道和JSM禅道bug

src/util/date.js

@@ -206,6 +206,10 @@ export function getYearDate() {
   const date = new Date();
   return date.getFullYear()
 }
+export function getMonthDate() {
+  const date = new Date();
+  return date.getMonth()+1
+}
 
 /**
  * 获取 n 天后的日期

src/views/financialManagement/paymentSettleFleet/paymentSettleDetailsPage.vue

@@ -110,7 +110,7 @@
       </el-dialog>
     </div>
     <messagePost v-if="messageVisble" ref="messagePost" @closeDialog="closeDialog"></messagePost>
-    <report-dialog :switchDialog="switchDialog" :reportId="form.id" reportName="吉永-付款" @onClose="onClose()" />
+    <report-dialog :switchDialog="switchDialog" :reportId="form.id" reportName="陆运-付款" @onClose="onClose()" />
   </div>
 </template>
 

src/views/financialManagement/receiptSettleFleet/receiptSettleDetailsPage.vue

@@ -110,7 +110,7 @@
       </el-dialog>
     </div>
     <messagePost v-if="messageVisble" ref="messagePost" @closeDialog="closeDialog"></messagePost>
-    <report-dialog :switchDialog="switchDialog" :reportId="form.id" reportName="吉永-收款" @onClose="onClose()" />
+    <report-dialog :switchDialog="switchDialog" :reportId="form.id" reportName="陆运-收款" @onClose="onClose()" />
   </div>
 </template>
 

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

@@ -228,6 +228,8 @@
                         plain size="small" :disabled="detailData.seeDisabled || pleasereviewType"
                         @click="copyfun('C')">生成应收
                     </el-button>
+                    <el-button type="info" plain size="small" :disabled="disabled"
+                    @click="allClick('付费申请', 'C')">付费申请</el-button>
                 </template>
                 <template slot="indexHeader" slot-scope="scope">
                     <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="primary"
@@ -1973,7 +1975,7 @@ export default {
         },
         // 客户的回调
         async corpChange(value, name, row, dc) {
-            if (name == 'corpCnName') {
+            if (name == 'shortName') {
                 if (!value) {
                     this.$set(row, 'shortName', '')
                     this.$set(row, 'corpCnName', '')
@@ -1981,8 +1983,9 @@ export default {
                     this.$set(row, 'corpId', '')
                 }
                 for (let item of this.corpCnNameData) {
+                    console.log(item)
                     if (item.shortName == value) {
-                        console.log(item)
+                      
                         this.$set(row, 'shortName', item.shortName)
                         this.$set(row, 'corpCnName', item.cnName)
                         this.$set(row, 'corpEnName', item.enName)
@@ -2510,7 +2513,29 @@ export default {
             })
 
         },
-
+        allClick(name, type) {
+            if (name == '付费申请') {
+                if (this.selectionCList.length == 0) return this.$message.error("请选择费用");
+                if (this.selectionCList.length != this.selectionCList.filter(e => e.corpCnName == this.selectionCList[0].corpCnName).length) return this.$message.error("请选择相同的结算单位");
+                if (this.$store.getters.payAppStatus) {
+                    this.$alert("付费申请页面已存在,请关闭付费申请再进行操作", "温馨提示", {
+                        confirmButtonText: "确定",
+                        type: 'warning',
+                        callback: action => {
+                        }
+                    });
+                } else {
+                    this.$router.push({
+                        path: `/iosBasicData/PaymentApplication/index`,
+                        query: {
+                            mblno: this.assemblyForm.mblno,
+                            corpCnName: this.selectionCList[0].corpCnName,
+                            corpId: this.selectionCList[0].corpId
+                        }
+                    })
+                }
+            }
+        },
         // 预览报表
         handleReportPreview(url, data) {
             console.log(url, 1670)

src/views/iosBasicData/AirtransportExport/bills/assembly/filescenter.vue

@@ -14,7 +14,9 @@
         </el-button>
       </template>
       <template slot="menu" slot-scope="{ row, index }">
-        <el-button size="small" icon="el-icon-delete" type="text" @click="rowPreview(row, index)">预 览
+        <el-button size="small" v-if="row.isImage==0" icon="el-icon-view" type="text" @click="rowDownload(row, index)">下 载
+        </el-button>
+        <el-button size="small" v-if="row.isImage==1" icon="el-icon-view" type="text" @click="rowPreview(row, index)">预 览
         </el-button>
         <el-button v-if="row.edit" size="small" icon="el-icon-edit" type="text" @click="rowCell(row, index)">保 存
         </el-button>

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

@@ -228,6 +228,8 @@
                         plain size="small" :disabled="detailData.seeDisabled || pleasereviewType"
                         @click="copyfun('C')">生成应收
                     </el-button>
+                    <el-button type="info" plain size="small" :disabled="disabled"
+                        @click="allClick('付费申请', 'C')">付费申请</el-button>
                 </template>
                 <template slot="indexHeader" slot-scope="scope">
                     <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="primary"
@@ -1973,7 +1975,7 @@ export default {
         },
         // 客户的回调
         async corpChange(value, name, row, dc) {
-            if (name == 'corpCnName') {
+            if (name == 'shortName') {
                 if (!value) {
                     this.$set(row, 'shortName', '')
                     this.$set(row, 'corpCnName', '')
@@ -2350,6 +2352,29 @@ export default {
                 }
             }
         },
+        allClick(name, type) {
+            if (name == '付费申请') {
+                if (this.selectionCList.length == 0) return this.$message.error("请选择费用");
+                if (this.selectionCList.length != this.selectionCList.filter(e => e.corpCnName == this.selectionCList[0].corpCnName).length) return this.$message.error("请选择相同的结算单位");
+                if (this.$store.getters.payAppStatus) {
+                    this.$alert("付费申请页面已存在,请关闭付费申请再进行操作", "温馨提示", {
+                        confirmButtonText: "确定",
+                        type: 'warning',
+                        callback: action => {
+                        }
+                    });
+                } else {
+                    this.$router.push({
+                        path: `/iosBasicData/PaymentApplication/index`,
+                        query: {
+                            mblno: this.assemblyForm.mblno,
+                            corpCnName: this.selectionCList[0].corpCnName,
+                            corpId: this.selectionCList[0].corpId
+                        }
+                    })
+                }
+            }
+        },
         // 生成账单接口
         finaccbillsGenerateBillfun(list) {
             const obj = {

src/views/iosBasicData/AirtransportImport/bills/assembly/filescenter.vue

@@ -14,7 +14,9 @@
         </el-button>
       </template>
       <template slot="menu" slot-scope="{ row, index }">
-        <el-button size="small" icon="el-icon-delete" type="text" @click="rowPreview(row, index)">预 览
+        <el-button size="small" v-if="row.isImage==0" icon="el-icon-view" type="text" @click="rowDownload(row, index)">下 载
+        </el-button>
+        <el-button size="small" v-if="row.isImage==1" icon="el-icon-view" type="text" @click="rowPreview(row, index)">预 览
         </el-button>
         <el-button v-if="row.edit" size="small" icon="el-icon-edit" type="text" @click="rowCell(row, index)">保 存
         </el-button>

src/views/iosBasicData/ComputationCenter/index.vue

@@ -30,6 +30,14 @@
                     </el-button>
                     <el-button v-if="tabsValue == '业务单据'" type="danger" size="small" plain @click="handleDelete()">一键删除
                     </el-button>
+                    <span style="font-size: 18px;">
+                        <span style="color: #67C23A;margin-right: 10px;">
+                            CNY:￥{{ amountSubSum }}元
+                        </span>
+                        <span style="color: #E6A23C;">
+                            USD:${{ amountSubUsdSum }}元
+                        </span>
+                    </span>
                 </template>
                 <tempalte slot="feeCnNameSearch">
                     <dic-select v-model="query.feeCnName" placeholder="费用名称" key="id" label="cnName" res="records"
@@ -78,6 +86,8 @@ export default {
     components: { settlementDetails, dicSelect },
     data() {
         return {
+            amountSubSum: 0,
+            amountSubUsdSum: 0,
             datekey: Date.now(),
             selectionList: [], // 多选的数据
             isShow: true,
@@ -111,6 +121,8 @@ export default {
                 viewBtn: false,
                 delBtn: false,
                 editBtn: false,
+                searchIcon: true,
+                searchIndex: 3,
                 menuWidth: '100',
                 column: [
                     {
@@ -547,8 +559,17 @@ export default {
         },
         // 多选回调
         selectionChange(list) {
-            console.log(list, '多选回调')
+            if (list.length) {
+                list.forEach(e => {
+                    this.amountSubSum += Number(e.amountSub)
+                    this.amountSubUsdSum += Number(e.amountSubUsd)
+                })
+            } else {
+                this.amountSubSum = 0
+                this.amountSubUsdSum = 0
+            }
             this.selectionList = list;
+
         },
         // 清空回调
         searchReset() {
@@ -682,6 +703,7 @@ export default {
             this.page.total = data.total;
             this.data = data.records;
             this.loading = false;
+            this.$refs.crud.refreshTable();
         },
         //自定义列保存
         async saveColumnTwo(ref, option, optionBack, code) {

src/views/iosBasicData/ComputationCenter/settlementDetails.vue

@@ -587,6 +587,7 @@ export default {
                     for (let index in this.tableData) {
                         if (item.accBillNo == this.tableData[index].accBillNo) {
                             this.tableData.splice(Number(index), 1)
+                            this.form.finStlBillsItemsList = this.tableData
                         }
                     }
                 })
@@ -611,6 +612,7 @@ export default {
                     })
                 }
                 this.tableData.splice(index, 1)
+                this.form.finStlBillsItemsList = this.tableData
             })
         },
         // 下拉回调
@@ -707,6 +709,7 @@ export default {
                         }
                     }
                 }
+                if (this.tableData.length == 0) return this.$message.error('请选择明细');
                 this.saveLoading = true // 打开按钮动画
                 if (this.form.estimatedTime) {
                     this.form.estimatedTime = this.form.estimatedTime + ' 00:00:00'
@@ -715,8 +718,7 @@ export default {
                 this.form.billNoFormat = 'STL'
                 this.form.businessTypeCode = 'STL'
                 this.form.businessType = 'STL' // 结算单
-                this.form.businessTypes = Array.isArray(this.form.businessTypes) ? this.form.businessTypes.join(',') : this.form.businessTypes // 业务类型
-                console.log(this.form.feeCnName, this.form.feeCnName.join(','))
+                this.form.businessTypes = this.form.businessTypes ? this.form.businessTypes.join(',') : this.form.businessTypes // 业务类型
                 this.form.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(',') : ''
                 this.form.businessDateStart = this.form.businessDateStart ? this.form.businessDateStart.slice(0, 10) + ' 00:00:00' : null // 财务开始日期
                 this.form.businessDateEnd = this.form.businessDateEnd ? this.form.businessDateEnd.slice(0, 10) + ' 00:00:00' : null // 财务开始日期
@@ -1160,6 +1162,7 @@ export default {
             finstlbillsConfirmSettlement(this.form).then(res => {
                 this.$message.success('操作成功');
                 this.finstlbillsDetailfun(res.data.data.id)
+                this.editSave=true
             }).finally(() => {
                 this.pageLoading = false
                 this.saveLoading = false

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

@@ -208,6 +208,8 @@
                     <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="primary"
                         plain size="small" :disabled="disabled || pleasereviewType" @click="copyfun('C')">生成应收
                     </el-button>
+                    <el-button type="info" plain size="small" :disabled="disabled"
+                    @click="allClick('付费申请', 'C')">付费申请</el-button>
                 </template>
                 <template slot="indexHeader" slot-scope="scope">
                     <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="primary"
@@ -1588,6 +1590,27 @@ export default {
             this.feesselectionList = list;
         },
         allClick(name, type) {
+            if (name == '付费申请') {
+                if (this.selectionCList.length == 0) return this.$message.error("请选择费用");
+                if (this.selectionCList.length != this.selectionCList.filter(e => e.corpCnName == this.selectionCList[0].corpCnName).length) return this.$message.error("请选择相同的结算单位");
+                if (this.$store.getters.payAppStatus) {
+                    this.$alert("付费申请页面已存在,请关闭付费申请再进行操作", "温馨提示", {
+                        confirmButtonText: "确定",
+                        type: 'warning',
+                        callback: action => {
+                        }
+                    });
+                } else {
+                    this.$router.push({
+                        path: `/iosBasicData/PaymentApplication/index`,
+                        query: {
+                            mblno: this.assemblyForm.mblno,
+                            corpCnName: this.selectionCList[0].corpCnName,
+                            corpId: this.selectionCList[0].corpId
+                        }
+                    })
+                }
+            }
             if (name == '发票申请') {
                 if (this.selectionDList.length == 0) return this.$message.error("请选择费用");
                 if (this.selectionDList.length != this.selectionDList.filter(e => e.corpCnName == this.selectionDList[0].corpCnName).length) return this.$message.error("请选择相同的结算单位");

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

@@ -14,7 +14,9 @@
         </el-button>
       </template>
       <template slot="menu" slot-scope="{ row, index }">
-        <el-button size="small" icon="el-icon-delete" type="text" @click="rowPreview(row, index)">预 览
+        <el-button size="small" v-if="row.isImage==0" icon="el-icon-view" type="text" @click="rowDownload(row, index)">下 载
+        </el-button>
+        <el-button size="small" v-if="row.isImage==1" icon="el-icon-view" type="text" @click="rowPreview(row, index)">预 览
         </el-button>
         <el-button v-if="row.edit" size="small" icon="el-icon-edit" type="text"
           :disabled="detailData.seeDisabled || disabled" @click="rowCell(row, index)">保 存

src/views/iosBasicData/PaymentApplication/assembly/finstlbillsitems.vue

@@ -54,8 +54,9 @@
             <el-table-column prop="currentStlAmountRMB" label="本次CNY" width="100px">
                 <template slot-scope="scope">
                     <el-input style="width: 100%;" v-model="scope.row.currentStlAmountRMB"
-                        :disabled="scope.row.curCode != 'CNY' || settlementdistar||!(form.status == '0' || form.status == '4'|| form.status == null)" v-if="(brfalse && !editSave)"
-                        size="mini" autocomplete="off" clearable placeholder="请输入USD" @change="armbChange(scope.row)">
+                        :disabled="scope.row.curCode != 'CNY' || settlementdistar || !(form.status == '0' || form.status == '4' || form.status == null)"
+                        v-if="(brfalse && !editSave)" size="mini" autocomplete="off" clearable placeholder="请输入USD"
+                        @change="armbChange(scope.row)">
                     </el-input>
                     <span v-else>{{ scope.row.currentStlAmountRMB }}</span>
                 </template>
@@ -114,23 +115,26 @@
             <el-table-column prop="taxInvoiceNumber" label="税票号" width="140px">
                 <template slot-scope="scope">
                     <el-input style="width: 100%;" v-model="scope.row.taxInvoiceNumber"
-                        v-if="scope.row.feeCnName == '增值税'" size="mini" autocomplete="off" clearable placeholder="请输入税票号">
+                        v-if="scope.row.feeCnName == '增值税'" size="mini" autocomplete="off" clearable
+                        placeholder="请输入税票号">
                     </el-input>
                     <span v-else>{{ scope.row.taxInvoiceNumber }}</span>
                 </template>
             </el-table-column>
             <el-table-column prop="taxInvoiceDate" label="税票日期" width="140px">
                 <template slot-scope="scope">
-                    <el-date-picker style="width: 100%;" v-model="scope.row.taxInvoiceDate" v-if="scope.row.feeCnName == '增值税'"
-                    size="mini" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
+                    <el-date-picker style="width: 100%;" v-model="scope.row.taxInvoiceDate"
+                        v-if="scope.row.feeCnName == '增值税'" size="mini" type="date" placeholder="选择日期"
+                        format="yyyy-MM-dd" value-format="yyyy-MM-dd">
                     </el-date-picker>
                     <span v-else>{{ scope.row.taxInvoiceDate }}</span>
                 </template>
             </el-table-column>
             <el-table-column prop="deductionTime" label="扣款时间" width="140px">
                 <template slot-scope="scope">
-                    <el-date-picker style="width: 100%;" v-model="scope.row.deductionTime" v-if="scope.row.feeCnName == '增值税'"
-                    size="mini" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
+                    <el-date-picker style="width: 100%;" v-model="scope.row.deductionTime"
+                        v-if="scope.row.feeCnName == '增值税'" size="mini" type="date" placeholder="选择日期"
+                        format="yyyy-MM-dd" value-format="yyyy-MM-dd">
                     </el-date-picker>
                     <span v-else>{{ scope.row.deductionTime }}</span>
                 </template>
@@ -149,12 +153,12 @@
                     <span v-else>{{ scope.row.remarkss }}</span>
                 </template>
             </el-table-column>
-            <el-table-column fixed="right" label="操作" width="100" v-if="brfalse">
+            <!-- <el-table-column fixed="right" label="操作" width="100" v-if="brfalse">
                 <template slot-scope="scope">
                     <el-button type="text" size="small" :disabled="editSave"
                         @click="deletefun(scope.row, scope.$index)">删除</el-button>
                 </template>
-            </el-table-column>
+            </el-table-column> -->
 
         </el-table>
     </div>
@@ -417,19 +421,23 @@ export default {
             let rowName = "",
                 findRow = this.handleSelectionData.find(c => c.rowIndex === row.rowIndex);
             if (findRow) {
-                rowName = "current-row "; // elementUI 默认高亮行的class类 不用再样式了^-^,也可通过css覆盖改变背景颜色
+                rowName = "current-row"; // elementUI 默认高亮行的class类 不用再样式了^-^,也可通过css覆盖改变背景颜色
             }
             return rowName; //也可以再加上其他类名 如果有需求的话
         },
         // 收付展示不一样的颜色
         cellStyle({ row, rowIndex, columnIndex }) {
             let rowStyle = ''
+            let bgStyle = ''
             if (row.dc == 'D') {
                 rowStyle = 'color:#8cb24b;'
             } else if (row.dc == 'C') {
                 rowStyle = 'color:#7ebace;'
-            } else { }
-            return rowStyle + 'padding:0px;fontSize:12px'
+            }
+            if (row.id) {
+                bgStyle = 'background: #f0f9eb;'
+            }
+            return rowStyle + 'padding:0px;fontSize:12px;' + bgStyle
         },
     },
     mounted() {

src/views/iosBasicData/PaymentApplication/index.vue

@@ -594,6 +594,7 @@ export default {
     selectionClear() {
       this.selectionList = [];
       this.$refs.crud.toggleSelection();
+      this.$refs.crud.refreshTable();
     },
     currentChange(currentPage) {
       this.page.currentPage = currentPage;

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

@@ -14,7 +14,9 @@
         </el-button>
       </template>
       <template slot="menu" slot-scope="{ row, index }">
-        <el-button size="small" icon="el-icon-delete" type="text" @click="rowPreview(row, index)">预 览
+        <el-button size="small" v-if="row.isImage==0" icon="el-icon-view" type="text" @click="rowDownload(row, index)">下 载
+        </el-button>
+        <el-button size="small" v-if="row.isImage==1" icon="el-icon-view" type="text" @click="rowPreview(row, index)">预 览
         </el-button>
         <el-button v-if="row.edit" size="small" icon="el-icon-edit" type="text" @click="rowCell(row, index)">保 存
         </el-button>

src/views/iosBasicData/UnpaidPaymentsDetails/index.vue

@@ -104,6 +104,8 @@ export default {
                 viewBtn: false,
                 delBtn: false,
                 editBtn: false,
+                searchIcon: true,
+                searchIndex: 3,
                 emptyBtnText: '清空所有条件',
                 column: [
                     {
@@ -165,11 +167,6 @@ export default {
                         overHidden: true,
                     },
                     {
-                        label: "汇率",
-                        prop: "rate",
-                        overHidden: true,
-                    },
-                    {
                         label: "箱型箱量",
                         prop: "quantityCntrDescr",
                         overHidden: true,
@@ -576,4 +573,7 @@ export default {
     background: #ecf5ff !important;
     text-align: center;
 }
+::v-deep .el-col-md-8 {
+    width: 24.33333%;
+}
 </style>

src/views/iosBasicData/advanceCharge/index.vue

@@ -217,6 +217,8 @@ export default {
                 this.$nextTick(() => {
                     this.$refs.crud.doLayout();
                     this.$refs.crud.dicInit();
+                    this.$refs.crud.refreshTable();
+                    
                 });
             }).finally(() => {
                 this.loading = false;

src/views/iosBasicData/bcorps/detailsPage.vue

@@ -277,22 +277,23 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                  <el-form-item label="外部报价 PS 规则" label-width="120" prop="psRateExternal">
-                        <el-input v-model="formData.psRateExternal" placeholder="请输入外部报价PS规则" clearable :style="{ width: '50%' }"
-                                  @input="psRateValid(formData, 'psRateExternal')" @blur="psRateBlue('psRateExternal')" />
-                        <!--<el-input-number v-model="formData.psRate" controls-position="right" @change="handleChange" :min="0"-->
-                        <!--  :precision="2" :step="1" :style="{ width: '100%' }"></el-input-number>-->
-                        <!--  <search-query :datalist="psRateData"-->
-                        <!--                :selectValue="formData.psRate"-->
-                        <!--                :filterable="true"-->
-                        <!--                :clearable="true"-->
-                        <!--                :buttonIf="false"-->
-                        <!--                :forParameter="{key:'dictKey',label:'dictValue',value:'dictKey'}"-->
-                        <!--                @corpChange="psRateChange($event,'psRate')"-->
-                        <!--                @corpFocus="psRateWorkDictsfun">-->
-                        <!--  </search-query>-->
-                    </el-form-item>
-                </el-col>
+                <el-form-item label="外部报价 PS 规则" label-width="120" prop="psRateExternal">
+                  <el-input v-model="formData.psRateExternal" placeholder="请输入外部报价PS规则" clearable
+                    :style="{ width: '50%' }" @input="psRateValid(formData, 'psRateExternal')"
+                    @blur="psRateBlue('psRateExternal')" />
+                  <!--<el-input-number v-model="formData.psRate" controls-position="right" @change="handleChange" :min="0"-->
+                  <!--  :precision="2" :step="1" :style="{ width: '100%' }"></el-input-number>-->
+                  <!--  <search-query :datalist="psRateData"-->
+                  <!--                :selectValue="formData.psRate"-->
+                  <!--                :filterable="true"-->
+                  <!--                :clearable="true"-->
+                  <!--                :buttonIf="false"-->
+                  <!--                :forParameter="{key:'dictKey',label:'dictValue',value:'dictKey'}"-->
+                  <!--                @corpChange="psRateChange($event,'psRate')"-->
+                  <!--                @corpFocus="psRateWorkDictsfun">-->
+                  <!--  </search-query>-->
+                </el-form-item>
+              </el-col>
               <el-col :span="6">
                 <el-form-item label="分管员" prop="adminProfiles">
                   <el-select v-model="formData.adminProfilesList" size="small" multiple @change="adminProfilesChange"
@@ -592,9 +593,13 @@
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label="账期设置" prop="accountPeriodType">
-                    <el-input v-model="formData.accountPeriodType" placeholder="请输入账期设置" clearable
+                    <!-- <el-input v-model="formData.accountPeriodType" placeholder="请输入账期设置" clearable
                       :style="{ width: '100%' }">
-                    </el-input>
+                    </el-input> -->
+                    <el-select v-model="formData.accountPeriodType" placeholder="请选择账期设置" style="width: 100%;">
+                      <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
+                      </el-option>
+                    </el-select>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
@@ -628,8 +633,8 @@
                       :style="{ width: '100%' }">
                     </el-input>
                     <!-- <el-date-picker v-model="formData.settlementMonth" type="month" placeholder="选择结清月份"
-                      style="width:100%" format="yyyy-MM" value-format="yyyy-MM"> -->
-                    </el-date-picker>
+                      style="width:100%" format="yyyy-MM" value-format="yyyy-MM">
+                    </el-date-picker> -->
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
@@ -1141,10 +1146,17 @@ export default {
   },
   data() {
     return {
+      options: [{
+        value: '票结',
+        label: '票结'
+      }, {
+        value: '月结',
+        label: '月结'
+      }],
       psRateData: [], // ps 规则数据
       psRateInternalMax: 0.5, // PS RATE 内部报价最大值
       psRateExternalMax: 0.7, // PS RATE 外部报价最大值
-        // 业务来源
+      // 业务来源
       sourceTypeData: [
         {
           label: '公司',
@@ -1197,6 +1209,7 @@ export default {
       corpsAttnDialogIndex: null,
       formData: {
         status: 0,
+        accountPeriodType:'票结',
         corpsAttnList: [],
         corpsBankList: [],
         corpsFilesList: [],
@@ -1411,7 +1424,7 @@ export default {
     this.getAllWorkDicts()
     isProcurement({ "param": "corpSource.required" }).then(res => {
       // res.data.data === '1'
-      if (res.data.data==1) {
+      if (res.data.data == 1) {
         this.rules.corpSource = [{
           required: true,
           message: ' ',
@@ -1426,17 +1439,17 @@ export default {
     })
     // PS RATE 内部报价最大值
     isProcurement({ "param": "psRate.Internal.max" }).then(res => {
-        console.log('psRateInternalMax', res.data.data)
-        // res.data.data= 0.5
-        let n = Number(res.data.data)
-        this.psRateInternalMax = isNaN(n) ? 0.5 : n
+      console.log('psRateInternalMax', res.data.data)
+      // res.data.data= 0.5
+      let n = Number(res.data.data)
+      this.psRateInternalMax = isNaN(n) ? 0.5 : n
     })
     // PS RATE 外部报价最大值
     isProcurement({ "param": "psRate.external.max" }).then(res => {
-        console.log('psRateExternalMax', res.data.data)
-        // default res.data.data= 0.7
-        let n = Number(res.data.data)
-        this.psRateExternalMax = isNaN(n) ? 0.7 : n
+      console.log('psRateExternalMax', res.data.data)
+      // default res.data.data= 0.7
+      let n = Number(res.data.data)
+      this.psRateExternalMax = isNaN(n) ? 0.7 : n
     })
   },
   mounted() { },
@@ -1466,10 +1479,10 @@ export default {
       if (reg.test(inputContent[name])) {
         let n = Number(inputContent[name])
         n = isNaN(n) ? 0 : n
-        if(name=='psRate') {
-            if (n > this.psRateInternalMax) n = this.psRateInternalMax
-        }else{
-            if (n > this.psRateExternalMax) n = this.psRateExternalMax
+        if (name == 'psRate') {
+          if (n > this.psRateInternalMax) n = this.psRateInternalMax
+        } else {
+          if (n > this.psRateExternalMax) n = this.psRateExternalMax
         }
         this.formData[name] = n;
       } else {
@@ -1483,10 +1496,10 @@ export default {
       if (this.formData[name]) {
         let n = Number(this.formData[name])
         n = isNaN(n) ? 0 : n
-        if(name=='psRate') {
-            if (n > this.psRateInternalMax) n = this.psRateInternalMax
-        }else{
-            if (n > this.psRateExternalMax) n = this.psRateExternalMax
+        if (name == 'psRate') {
+          if (n > this.psRateInternalMax) n = this.psRateInternalMax
+        } else {
+          if (n > this.psRateExternalMax) n = this.psRateExternalMax
         }
         this.$set(this.formData, name, n.toFixed(2))
       } else {

src/views/iosBasicData/financeProfit/index.vue

@@ -122,7 +122,7 @@ export default {
                 calcHeight: 30,
                 tip: false,
                 searchShow: true,
-                searchMenuSpan: 10,
+                searchMenuSpan: 24,
                 border: true,
                 index: false,
                 selection: true,
@@ -338,7 +338,7 @@ export default {
                         overHidden: true,
                     },
                     {
-                        label: "实收美元",
+                        label: "实收人民币",
                         prop: "realAmountDr",
                         overHidden: true,
                     },
@@ -392,15 +392,15 @@ export default {
                         prop: "realAmountProfitLoc",
                         overHidden: true,
                     },
-                    {
-                        label: "委托人",
-                        prop: "client",
-                        overHidden: true,
-                        hide: true,
-                        search: true,
-                        searchslot: true,
-                        searchOrder: 3
-                    },
+                    // {
+                    //     label: "委托人",
+                    //     prop: "client",
+                    //     overHidden: true,
+                    //     hide: true,
+                    //     search: true,
+                    //     searchslot: true,
+                    //     searchOrder: 3
+                    // },
                     {
                         label: "业务来源",
                         prop: "srcType",
@@ -418,7 +418,7 @@ export default {
                         searchslot: true,
                         searchLabelWidth: '0',
                         searchOrder: 14,
-                        searchSpan: 14,
+                        searchSpan: 18,
                     },
                 ]
             },

src/views/iosBasicData/fininvoices/fininvoicesDetails.vue

@@ -45,7 +45,7 @@
                                             </el-date-picker>
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :span="24">
+                                    <el-col :span="12">
                                         <el-form-item label="开票单位" prop="invCorpCnName">
                                             <search-query :datalist="invCorpData" :selectValue="form.invCorpCnName"
                                                 :clearable="true" :disabled="editSave || !form.corpId" :buttonIf="false"
@@ -58,6 +58,15 @@
                                         </el-form-item>
                                     </el-col>
                                     <el-col :span="12">
+                                        <el-form-item label="收/付" prop="dc">
+                                            <el-select v-model="form.dc" placeholder="请选择" :disabled="editSave" size="small">
+                                                <el-option v-for="item in options" :key="item.value" :label="item.label"
+                                                    :value="item.value">
+                                                </el-option>
+                                            </el-select>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="12">
                                         <el-form-item label="税号" prop="invCorpTaxNo">
                                             <el-input style="width: 100%;" v-model="form.invCorpTaxNo" size="small"
                                                 autocomplete="off" :disabled="true" clearable placeholder="请输入税号">
@@ -501,10 +510,24 @@ import {
 import { getWorkDicts } from "@/api/system/dictbiz";
 import { getCurrentDate } from "@/util/date";
 import dicSelect from "@/components/dicSelect/main";
+import {getMonthDate,getYearDate} from "@/util/date";
+import { bcurexrateList } from "@/api/iosBasicData/rateManagement";
 export default {
     components: { SearchQuery, fininvoicesitems, fininvoiceitemdetail, dicSelect },
     data() {
         return {
+            options: [
+                {
+                    value: null,
+                    label: '全部'
+                }, {
+                    value: 'D',
+                    label: '收'
+                }, {
+                    value: 'C',
+                    label: '付'
+                }
+            ],
             showForm: false,
             invoiceAmountCNY: 0, // 费用明细开票金额输入框CNY
             invoiceAmountUSD: 0, // 费用明细开票金额输入框USD
@@ -515,6 +538,7 @@ export default {
             pageLoading: false, // 全屏加载
             saveLoading: false, // 按钮加载
             form: {
+                dc:'C',
                 invCurCode: 'CNY',
                 isRp: 1,
                 invType: '全电发票',
@@ -593,13 +617,20 @@ export default {
         // 获取当前登录人个人信息
         this.saberUserInfo = JSON.parse(localStorage.getItem('saber-userInfo')).content
         if (!this.form.id) {
-            getRateList({ current: 1, size: 30 }).then(res => {
+            bcurexrateList({ current: 1, size: 35,type:'月汇率',code:'USD',exrateYear:getYearDate() }).then(res => {
                 for (let item of res.data.data.records) {
-                    if (item.code == "USD") {
-                        this.$set(this.form, 'exrate', item.exrate)
+                    if (item.exrateMonth == getMonthDate()) {
+                        this.$set(this.form, 'exrate', item.exratePayment)
                     }
                 }
             })
+            // getRateList({ current: 1, size: 30 }).then(res => {
+            //     for (let item of res.data.data.records) {
+            //         if (item.code == "USD") {
+            //             this.$set(this.form, 'exrate', item.exrate)
+            //         }
+            //     }
+            // })
         }
     },
     methods: {
@@ -1067,10 +1098,12 @@ export default {
             obj.curCode = this.form.curCode // 币种
             obj.businessType = this.form.businessTypes ? this.form.businessTypes.join(',') : '' // 业务类型
             obj.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(',') : ''
+            obj.dc=this.form.dc
             // 判断是否有对账单号
             if (this.form.checkNo) {
                 obj.corpId = this.form.corpId // 结算单位
                 obj.checkNo = this.form.checkNo // CHK NO 对账单号
+                // obj.dc="C"
                 finstlbillsGetByDetail(obj).then(res => {
                     let arr = res.data.data.finStlBillsItemsList.map((item, index) => {
                         item.lineNo = Number(index) + 1 // 行号
@@ -1112,14 +1145,17 @@ export default {
             } else {
                 obj.corpCnName = this.form.corpId // 结算单位
                 obj.checkBillNo = this.form.checkNo // 对账单号
+                // obj.dc="C"
                 finstlbillslistAccBillV1(obj).then(res => {
                     let arr = res.data.data.map((item, index) => {
                         item.lineNo = Number(index) + 1 // 行号
                         item.accBillId = item.id
                         item.accBillNo = item.billNo
+                        item.billNo = item.businessBillNo
                         item.accDate = item.createTime
                         item.currentCurCode = item.curCode
                         item.currentExrate = item.exrate
+                        item.dc = item.accountDc
                         if (item.currentCurCode == 'CNY') {
                             // 本次发票金额
                             this.$set(item, 'currentAmountCNY', item.appliedInvoiceCurrentAmount)

src/views/iosBasicData/fininvoices/index.vue

@@ -769,6 +769,7 @@ export default {
     selectionClear() {
       this.selectionList = [];
       this.$refs.crud.toggleSelection();
+      this.$refs.crud.refreshTable();
     },
     currentChange(currentPage) {
       this.page.currentPage = currentPage;

src/views/iosBasicData/fininvoicesApplyfor/index.vue

@@ -814,6 +814,7 @@ export default {
     selectionClear() {
       this.selectionList = [];
       this.$refs.crud.toggleSelection();
+      this.$refs.crud.refreshTable();
     },
     currentChange(currentPage) {
       this.page.currentPage = currentPage;

src/views/iosBasicData/fininvoicesOutput/fininvoicesDetails.vue

@@ -45,7 +45,7 @@
                                             </el-date-picker>
                                         </el-form-item>
                                     </el-col>
-                                    <el-col :span="24">
+                                    <el-col :span="12">
                                         <el-form-item label="开票单位" prop="invCorpCnName">
                                             <search-query :datalist="invCorpData" :selectValue="form.invCorpCnName"
                                                 :clearable="true" :disabled="editSave || !form.corpId" :buttonIf="false"
@@ -58,6 +58,15 @@
                                         </el-form-item>
                                     </el-col>
                                     <el-col :span="12">
+                                        <el-form-item label="收/付" prop="dc">
+                                            <el-select v-model="form.dc" placeholder="请选择" :disabled="editSave" size="small">
+                                                <el-option v-for="item in options" :key="item.value" :label="item.label"
+                                                    :value="item.value">
+                                                </el-option>
+                                            </el-select>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="12">
                                         <el-form-item label="税号" prop="invCorpTaxNo">
                                             <el-input style="width: 100%;" v-model="form.invCorpTaxNo" size="small"
                                                 autocomplete="off" :disabled="true" clearable placeholder="请输入税号">
@@ -489,6 +498,7 @@
 </template>
 
 <script>
+import { bcurexrateList } from "@/api/iosBasicData/rateManagement";
 import fininvoicesitems from "@/views/iosBasicData/fininvoicesApplyfor/assembly/fininvoicesitems.vue";
 import fininvoiceitemdetail from "@/views/iosBasicData/fininvoicesApplyfor/assembly/fininvoiceitemdetail.vue";
 import { getRateList } from "@/api/iosBasicData/rateManagement";
@@ -510,11 +520,24 @@ import {
 import { getWorkDicts } from "@/api/system/dictbiz";
 import { getCurrentDate } from "@/util/date";
 import dicSelect from "@/components/dicSelect/main";
-import { finstlbillslistAccBillByCorp } from '@/api/iosBasicData/finstlbills'
+import { finstlbillslistAccBillByCorp } from '@/api/iosBasicData/finstlbills';
+import { getMonthDate, getYearDate } from "@/util/date";
 export default {
     components: { SearchQuery, fininvoicesitems, fininvoiceitemdetail, dicSelect },
     data() {
         return {
+            options: [
+                {
+                    value: null,
+                    label: '全部'
+                }, {
+                    value: 'D',
+                    label: '收'
+                }, {
+                    value: 'C',
+                    label: '付'
+                }
+            ],
             showForm: false,
             retrievePopupsType: false, // 弹窗开启关闭
             retrievePopupsData: [], // 选择弹窗数据
@@ -554,6 +577,7 @@ export default {
             pageLoading: false, // 全屏加载
             saveLoading: false, // 按钮加载
             form: {
+                dc:'D',
                 invCurCode: 'CNY',
                 isRp: 1,
                 invType: '全电发票',
@@ -632,13 +656,20 @@ export default {
         // 获取当前登录人个人信息
         this.saberUserInfo = JSON.parse(localStorage.getItem('saber-userInfo')).content
         if (!this.form.id) {
-            getRateList({ current: 1, size: 30 }).then(res => {
+            bcurexrateList({ current: 1, size: 35, type: '月汇率', code: 'USD', exrateYear: getYearDate() }).then(res => {
                 for (let item of res.data.data.records) {
-                    if (item.code == "USD") {
-                        this.$set(this.form, 'exrate', item.exrate)
+                    if (item.exrateMonth == getMonthDate()) {
+                        this.$set(this.form, 'exrate', item.exrateReceipts)
                     }
                 }
             })
+            // getRateList({ current: 1, size: 30 }).then(res => {
+            //     for (let item of res.data.data.records) {
+            //         if (item.code == "USD") {
+            //             this.$set(this.form, 'exrate', item.exrate)
+            //         }
+            //     }
+            // })
         }
     },
     methods: {
@@ -1161,10 +1192,12 @@ export default {
             obj.curCode = this.form.curCode // 币种
             obj.businessType = this.form.businessTypes ? this.form.businessTypes.join(',') : '' // 业务类型
             obj.feeCnName = this.form.feeCnName ? this.form.feeCnName.join(',') : ''
+            obj.dc=this.form.dc
             // 判断是否有对账单号
             if (this.form.checkNo) {
                 obj.corpId = this.form.corpId // 结算单位
                 obj.checkNo = this.form.checkNo // CHK NO 对账单号
+                // obj.dc='D'
                 finstlbillsGetByDetail(obj).then(res => {
                     let arr = res.data.data.finStlBillsItemsList.map((item, index) => {
                         item.lineNo = Number(index) + 1 // 行号
@@ -1207,6 +1240,7 @@ export default {
                 obj.billNo = this.form.businessNo // 业务编号
                 obj.corpCnName = this.form.corpId // 结算单位
                 obj.checkBillNo = this.form.checkNo // 对账单号
+                // obj.dc='D'
                 finstlbillslistAccBillV1(obj).then(res => {
                     let arr = res.data.data.map((item, index) => {
                         console.log(item)

src/views/iosBasicData/fininvoicesOutput/index.vue

@@ -20,6 +20,14 @@
                 @saveColumn="saveColumnTwo('applyCrud', 'applyOption', 'applyOptionBack', 319)" @on-load="onLoad">
                 <template slot="menuLeft" slot-scope="{row}">
                     <el-button type="success" size="small" @click="multipleInvoicing">选择开票</el-button>
+                    <span style="font-size: 18px;">
+                        <span style="color: #67C23A;margin-right: 10px;">
+                            CNY:￥{{ amountSubSum }}元
+                        </span>
+                        <span style="color: #E6A23C;">
+                            USD:${{ amountSubUsdSum }}元
+                        </span>
+                    </span>
                 </template>
                 <template slot="menu" slot-scope="{row}">
                     <el-button type="text" size="small"
@@ -44,6 +52,14 @@
                     </el-button>
                     <el-button type="danger" size="small" icon="el-icon-delete" plain @click="handleDelete">一键删除
                     </el-button>
+                    <span style="font-size: 18px;">
+                        <span style="color: #67C23A;margin-right: 10px;">
+                            CNY:￥{{ amountSubSum }}元
+                        </span>
+                        <span style="color: #E6A23C;">
+                            USD:${{ amountSubUsdSum }}元
+                        </span>
+                    </span>
                 </template>
                 <template slot="menu" slot-scope="{row}">
                     <el-button type="text" size="small" @click="editFun(row)">编辑
@@ -93,6 +109,8 @@ export default {
     components: { finstlbillsDetails, fininvoicesDetails, dicSelect },
     data() {
         return {
+            amountSubSum: 0,
+            amountSubUsdSum: 0,
             datekey: Date.now(),
             tabsValue: '申请',
             // 详情页面和列表切换
@@ -1065,6 +1083,15 @@ export default {
         },
         // 多选反的数据
         selectionChange(list) {
+            if (list.length) {
+                list.forEach(e => {
+                    this.amountSubSum += Number(e.amountSub)
+                    this.amountSubUsdSum += Number(e.amountSubUsd)
+                })
+            } else {
+                this.amountSubSum = 0
+                this.amountSubUsdSum = 0
+            }
             if (this.tabsValue == '申请') {
                 this.applySelectionList = list;
             } else {
@@ -1075,10 +1102,13 @@ export default {
             if (this.tabsValue == '申请') {
                 this.applySelectionList = [];
                 this.$refs.applyCrud.toggleSelection();
+                this.$refs.applyCrud.refreshTable();
             } else {
                 this.selectionList = [];
                 this.$refs.crud.toggleSelection();
+                this.$refs.crud.refreshTable();
             }
+            
         },
         // 分页
         currentChange(currentPage) {

src/views/iosBasicData/finstlbills/assembly/finstlbillsitems.vue

@@ -25,6 +25,12 @@
                     <span v-if="row.dc=='C'">付</span>
                 </template>
             </el-table-column>
+            <el-table-column prop="isInvoice" label="开票状态" width="80px">
+                <template slot-scope="{ row }">
+                    <span v-if="row.isInvoice == 0">开票</span>
+                    <span v-if="row.isInvoice == 3">禁止开票</span>
+                </template>
+            </el-table-column>
             <el-table-column prop="billNo" label="原业务编号" width="120px">
                 <template slot-scope="{ row }">
                     <span class="textHide">{{ row.billNo }}</span>
@@ -191,9 +197,6 @@
                     <span class="textHide">{{ row.billNo }}</span>
                 </template>
             </el-table-column>
-            <!--currentStlDiscount-->
-            <el-table-column prop="dc" label="收/付">
-            </el-table-column>
             <el-table-column prop="unsettledAmountRMB" label="应对账CNY" width="100px">
             </el-table-column>
             <el-table-column prop="unsettledAmountUSD" label="应对账USD" width="100px">

src/views/iosBasicData/finstlbills/finstlbillsDetails.vue

@@ -1021,6 +1021,12 @@ export default {
                 this.$message.warning("请选择至少一条数据");
                 return;
             }
+            for (let item of this.handleSelectionData) {
+                if (item.isInvoice == 3) {
+                    this.$message.error('已禁止开票，请重新选择');
+                    return;
+                }
+            }
             this.$confirm("确定将选择数据确认开票?", {
                 confirmButtonText: "确定",
                 cancelButtonText: "取消",
@@ -1035,6 +1041,12 @@ export default {
                 this.$message.warning("请选择至少一条数据");
                 return;
             }
+            for (let item of this.handleSelectionData) {
+                if (item.isInvoice == 0) {
+                    this.$message.error('已开票，请重新选择');
+                    return;
+                }
+            }
             this.$confirm("确定将选择数据撤销签收?", {
                 confirmButtonText: "确定",
                 cancelButtonText: "取消",

src/views/iosBasicData/finstlbills/index.vue

@@ -728,6 +728,7 @@ export default {
     selectionClear() {
       this.selectionList = [];
       this.$refs.crud.toggleSelection();
+      this.$refs.crud.refreshTable();
     },
     currentChange(currentPage) {
       this.page.currentPage = currentPage;

src/views/iosBasicData/paymentDetail/index.vue

@@ -120,6 +120,8 @@ export default {
                 viewBtn: false,
                 delBtn: false,
                 editBtn: false,
+                searchIcon: true,
+                searchIndex: 3,
                 emptyBtnText: '清空所有条件',
                 column: [
                     {
@@ -675,4 +677,7 @@ export default {
     background: #ecf5ff !important;
     text-align: center;
 }
+::v-deep .el-col-md-8 {
+    width: 24.33333%;
+}
 </style>

src/views/iosBasicData/storageFeeF/detailsPage.vue

@@ -80,6 +80,19 @@ export default {
                         prop: "warehouseName",
                         disabled: false,
                     },
+                    {
+                        label: "计费规则",
+                        prop: "billingRules",
+                        type: "select",
+                        dicData: [{
+                            label: '净重',
+                            value: '0'
+                        }, {
+                            label: '毛重',
+                            value: '1'
+                        }],
+                        disabled: true,
+                    },
                     // {
                     //     label: "计费规则",
                     //     prop: "billingRules",
@@ -161,19 +174,19 @@ export default {
                         overHidden: true
                     },
                     {
-                        label: "剩余件数",
+                        label: "件数",
                         prop: "surplusQuantity",
                         // cell: true,
                         overHidden: true
                     },
                     {
-                        label: "剩余净重",
+                        label: "净重",
                         prop: "surplusNetWeight",
                         // cell: true,
                         overHidden: true
                     },
                     {
-                        label: "剩余毛重",
+                        label: "毛重",
                         prop: "surplusWeight",
                         // cell: true,
                         overHidden: true
@@ -236,7 +249,7 @@ export default {
             obj = {
                 warehouseId: this.form.warehouseId,
                 warehouseName: this.form.warehouseName,
-                chargingStartDate: this.form.chargingStartDate,
+                // chargingStartDate: this.form.chargingStartDate,
                 chargingEndDate: this.form.chargingEndDate,
             }
             const loading = this.$loading({
@@ -263,10 +276,10 @@ export default {
             if (name == 'warehouseName') {
                 if (row) {
                     this.form.warehouseId = row.id
-                    // this.form.billingRules=row.billingRules
+                    this.form.billingRules=row.billingRules
                 } else {
                     this.form.billingRules=null
-                    // this.form.warehouseId = null
+                    this.form.warehouseId = null
                 }
             }
         },

src/views/iosBasicData/storageFeeF/index.vue

@@ -85,6 +85,19 @@ export default {
                     //     overHidden: true
                     // },
                     {
+                        label: "计费规则",
+                        prop: "billingRules",
+                        type: "select",
+                        dicData: [{
+                            label: '净重',
+                            value: '0'
+                        }, {
+                            label: '毛重',
+                            value: '1'
+                        }],
+                        overHidden: true
+                    },
+                    {
                         label: "计费结束时间",
                         prop: "chargingEndDate",
                         search: true,

src/views/tradeAgency/oceanFreightImport/detailsPage.vue

@@ -215,19 +215,19 @@
                     </template>
                     <template slot="cntrTypeCodeHeader" slot-scope="{column}">
                         <span style="color: #1e9fff;cursor: pointer;" @click="inJump('箱型')">{{ (column || {}).label
-                            }}</span>
+                        }}</span>
                     </template>
                     <template slot="goodsNameHeader" slot-scope="{column}">
                         <span style="color: #1e9fff;cursor: pointer;" @click="inJump('HSCODE')">{{ (column || {}).label
-                            }}</span>
+                        }}</span>
                     </template>
                     <template slot="hsCodeHeader" slot-scope="{column}">
                         <span style="color: #1e9fff;cursor: pointer;" @click="inJump('HSCODE')">{{ (column || {}).label
-                            }}</span>
+                        }}</span>
                     </template>
                     <template slot="goodsTypeHeader" slot-scope="{column}">
                         <span style="color: #1e9fff;cursor: pointer;" @click="inJump('类型')">{{ (column || {}).label
-                            }}</span>
+                        }}</span>
                     </template>
                     <template slot="index" slot-scope="{row,index}">
                         <span>{{ index + 1 }}</span>
@@ -365,7 +365,7 @@
                     @saveColumn="saveColumn('crud3', 'option3', 'optionBack3', 390)">
                     <template slot="storageUnitHeader" slot-scope="{column}">
                         <span style="color: #1e9fff;cursor: pointer;" @click="inJump('入库单位')">{{ (column || {}).label
-                            }}</span>
+                        }}</span>
                     </template>
                     <template slot="warehouseName" slot-scope="{ row }">
                         <dic-select v-if="row.$cellEdit" v-model="row.warehouseName" placeholder="入库" key="id"
@@ -1463,6 +1463,19 @@ export default {
                         overHidden: true,
                     },
                     {
+                        label: "计费规则",
+                        prop: "billingRules",
+                        type: "select",
+                        dicData: [{
+                            label: '净重',
+                            value: '0'
+                        }, {
+                            label: '毛重',
+                            value: '1'
+                        }],
+                        overHidden: true
+                    },
+                    {
                         label: "品名",
                         prop: "goodsName",
                         width: "120",
@@ -2133,8 +2146,10 @@ export default {
             if (name == 'warehouseName') {
                 if (row) {
                     el.warehouseId = row.id
+                    el.billingRules = row.billingRules
                 } else {
                     el.warehouseId = null
+                    el.billingRules = null
                 }
             }
         },