1.营业费用 新加报表模块 新加访问记录功能

2.SOC COC 新加批量复制模块
3.审批数据 营业费用审批打开报表
4.客户订舱 修改限制规则 客户托书  出口  新加邮件人电话邮件人邮箱
5.客户订舱 客户托书 列表页新加字段
6.财务管理 付费申请 结算中心 新加字段 并修改保存方式
7.财务管理 列表页新加币别
8.wo(拿) 点击选择合约导入数据

src/api/boxManagement/reports.js

@@ -66,6 +66,15 @@ export const reportsGetReportData = (row) => {
   })
 }
 
+// 访问记录
+export const getPrint = (row) => {
+  return request({
+    url: '/api/blade-los/operatingexpenses/print',
+    method: 'get',
+    params: row
+  })
+}
+
 export const fingenlegGetReportData = (row) => {
   return request({
     url: '/api/blade-los/fingenleg/getReportData',

src/api/iosBasicData/costcenter/coc.js

@@ -161,4 +161,12 @@ export const batchRevokeDisable = (params) => {
         method: 'get',
         params: params
     })
+}
+// 批量复制
+export const batchCopy = (params) => {
+  return request({
+    url: '/api/blade-los/routecost/batchCopy',
+    method: 'get',
+    params: params
+  })
 }

src/api/iosBasicData/costcenter/soc.js

@@ -161,4 +161,12 @@ export const batchRevokeDisable = (params) => {
     method: 'get',
     params: params
   })
+}
+// 批量复制
+export const batchCopy = (params) => {
+  return request({
+    url: '/api/blade-los/routecost/batchCopy',
+    method: 'get',
+    params: params
+  })
 }

src/components/boxManagement/businessReports.vue

@@ -24,7 +24,7 @@
 
 <script>
 import { getList, getDetail, add, update, remove, printingUpdate } from "@/api/boxManagement/reports";
-import { reportsGetReportData } from "@/api/boxManagement/reports";
+import { reportsGetReportData, getPrint } from "@/api/boxManagement/reports";
 import { getUserApprovalList } from "@/api/approval/processConfig";
 import { mapGetters } from "vuex";
 import { billsDetail } from '@/api/iosBasicData/bills'
@@ -555,6 +555,9 @@ export default {
       //   },
       // ]
       // 获取报表数据
+      if (this.businessValue == 'YYFY') {
+        getPrint({ id: this.id })
+      }
       const res = await reportsGetReportData({
         billId: this.id,
         reportCode: this.form.code,
@@ -654,6 +657,9 @@ export default {
                 date: res.data.date
               }
             }
+            if (this.businessValue == 'YYFY') {
+        getPrint({ id: this.id })
+      }
             reportsGetReportData(obj).then(res => {
               if (this.selecList.length || this.type) {
                 this.handleReportPreview(url, res.data.data.data)
@@ -686,6 +692,9 @@ export default {
             corpIds: row.id
           }
         }
+        if (this.businessValue == 'YYFY') {
+        getPrint({ id: this.id })
+      }
         reportsGetReportData(obj).then(res => {
           if (this.selecList.length || this.type) {
             this.handleReportPreview(url, res.data.data.data)

src/components/boxManagement/reports.vue

@@ -51,7 +51,7 @@ import { mapGetters } from "vuex";
 import { billsDetail } from '@/api/iosBasicData/bills'
 import { bbusinesstypeList } from "@/api/iosBasicData/bbusinesstype";
 import reportContainer from "@/views/iosBasicData/report-container/report-container.vue"
-import { reportsGetReportData } from "@/api/boxManagement/reports";
+import { reportsGetReportData, getPrint } from "@/api/boxManagement/reports";
 import mailComponent from "@/components/iosbasic-data/mail-component.vue";
 export default {
   components: {
@@ -585,6 +585,9 @@ export default {
       //   },
       // ]
       // 获取报表数据
+      if (this.businessValue == 'YYFY') {
+        getPrint({ id: this.id })
+      }
       const res = await reportsGetReportData({
         billId: this.id,
         reportCode: this.form.classifyCode,
@@ -687,6 +690,9 @@ export default {
       // 加载数据
       if (this.id) {
         // billsDetail(this.id).then(res => {
+        if (this.businessValue == 'YYFY') {
+          getPrint({ id: this.id })
+        }
         reportsGetReportData({
           billId: this.id,
           reportCode: row.classifyCode,

src/views/approveDataH/index.vue

@@ -37,6 +37,7 @@
         <span v-else-if="scope.row.checkType == 'KHTS'">客户托书</span>
         <span v-else-if="scope.row.checkType == 'FY-SQXG'">费用申请修改</span>
         <span v-else-if="scope.row.checkType == 'FY-SQSC'">费用申请删除</span>
+        <span v-else-if="scope.row.checkType == 'YYFY'">营业费用</span>
       </template>
       <template slot-scope="scope" slot="billNo">
         <span style="color: #1e9fff;cursor: pointer;" @click="billNoDetails(scope.row)">{{ scope.row.billNo }}</span>
@@ -92,6 +93,9 @@
         <el-button type="text" size="small" v-else-if="scope.row.checkType == 'KHTS'"
           :disabled="scope.row.auditStatus != 'S'" @click.stop="printWindowfun(scope.row, 'KHTS')">审批
         </el-button>
+        <el-button type="text" size="small" v-else-if="scope.row.checkType == 'YYFY'"
+          :disabled="scope.row.auditStatus != 'S'" @click.stop="printWindowfun(scope.row, 'YYFY')">审批
+        </el-button>
         <el-button type="text" size="small" v-else :disabled="scope.row.auditStatus != 'S'"
           @click.stop="openCheck(scope.row)">审批
         </el-button>
@@ -351,6 +355,13 @@ export default {
           classifyCode: 'KHTS',
           groupCode: 'KHTS'
         }
+      } else if (type == 'YYFY') {
+        obj = {
+          billId: row.billId,
+          businessType: 'YYFY',
+          classifyCode: 'YYFY',
+          groupCode: 'YYFY'
+        }
       }
       getreportsList(1, 10, obj).then(res => {
         this.reportRadio(res.data.data.records[0], type)
@@ -372,7 +383,7 @@ export default {
     // 获取报表数据
     reportRadio(val, type) {
       console.log(val, 240)
-      if (type == 'FYSQ' || type == 'FYSQ-C') {
+      if (type == 'FYSQ' || type == 'FYSQ-C'|| type == 'YYFY') {
         reportsGetReportDataBox({
           billId: this.reportsData.srcBillId,
           reportCode: val.classifyCode,

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

@@ -736,9 +736,8 @@
                                     <span style="color: #1e9fff">{{ $t("sea118n.bookRemarks") }}</span>
                                 </span>
                                 <el-input type="textarea" style="width: 100%;" v-model="assemblyForm.cyRemarks"
-                                    size="small" autocomplete="off"
-                                    :disabled="detailData.seeDisabled || generateBillsfalse" rows="2" clearable
-                                    placeholder="请输入场站备注" @change="textareaBlur('cyRemarks')"></el-input>
+                                    size="small" autocomplete="off" :disabled="detailData.seeDisabled" rows="2"
+                                    clearable placeholder="请输入场站备注" @change="textareaBlur('cyRemarks')"></el-input>
                             </el-form-item>
                         </el-row>
                         <el-row>
@@ -1057,22 +1056,33 @@
                     </el-row>
                     <el-row>
                         <el-col :span="12">
-                            <el-form-item label="接单状态" prop="billOfLadingStatus">
+                            <el-form-item label="邮箱" prop="fileEmail">
                                 <span slot="label">
-                                    <span style="color: #1e9fff">接单状态</span>
+                                    <span style="color: #1e9fff">邮箱</span>
                                 </span>
-                                <dic-select v-model="assemblyForm.billOfLadingStatus" placeholder="接单状态" key="id"
-                                    label="dictValue" url="/blade-system/dict-biz/dictionary?code=billOfLadingStatus"
-                                    :disabled="detailData.seeDisabled"></dic-select>
+                                <el-input style="width: 100%;" size="small" v-model="assemblyForm.fileEmail"
+                                    :disabled="detailData.seeDisabled" placeholder="文件联络人邮箱"></el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item label="邮箱" prop="fileEmail">
+                            <el-form-item label="电话" prop="fileTel">
                                 <span slot="label">
-                                    <span style="color: #1e9fff">邮箱</span>
+                                    <span style="color: #1e9fff">电话</span>
                                 </span>
-                                <el-input style="width: 100%;" size="small" v-model="assemblyForm.fileEmail"
-                                    :disabled="detailData.seeDisabled" placeholder="文件联络人邮箱"></el-input>
+                                <el-input style="width: 100%;" size="small" v-model="assemblyForm.fileTel"
+                                    :disabled="detailData.seeDisabled" placeholder="文件联络人电话"></el-input>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                    <el-row>
+                        <el-col :span="12">
+                            <el-form-item label="接单状态" prop="billOfLadingStatus">
+                                <span slot="label">
+                                    <span style="color: #1e9fff">接单状态</span>
+                                </span>
+                                <dic-select v-model="assemblyForm.billOfLadingStatus" placeholder="接单状态" key="id"
+                                    label="dictValue" url="/blade-system/dict-biz/dictionary?code=billOfLadingStatus"
+                                    :disabled="detailData.seeDisabled"></dic-select>
                             </el-form-item>
                         </el-col>
                     </el-row>

src/views/iosBasicData/businessCenter/customerBooking/detailsPage.vue

@@ -163,10 +163,11 @@
                         :rules="[{ required: true, message: ' ', trigger: 'blur' }]">
                         <dic-select v-model="form.polCnName" placeholder="起运港" key="id" label="cnName" res="records"
                           url="/blade-los/bports/list?current=1&size=5" :filterable="true" :remote="true"
-                          dataName="cnName" @selectChange="dicChange('polCnName', $event)" :disabled="editDisabled||!flxDisabled"
-                          :slotRight="true" rightLabel="code"></dic-select>
-                        <el-input style="width: 100%;" v-model="form.polNamePrint" size="small" :disabled="editDisabled||!flxDisabled"
-                          clearable placeholder="装货港" @change="textareaBlur2('polNamePrint', $event)"></el-input>
+                          dataName="cnName" @selectChange="dicChange('polCnName', $event)"
+                          :disabled="editDisabled || !flxDisabled" :slotRight="true" rightLabel="code"></dic-select>
+                        <el-input style="width: 100%;" v-model="form.polNamePrint" size="small"
+                          :disabled="editDisabled || !flxDisabled" clearable placeholder="装货港"
+                          @change="textareaBlur2('polNamePrint', $event)"></el-input>
                       </el-form-item>
                     </el-col>
                     <el-col span="12">
@@ -174,10 +175,11 @@
                         :rules="[{ required: true, message: ' ', trigger: 'blur' }]">
                         <dic-select v-model="form.podCnName" placeholder="卸货港" key="id" label="cnName" res="records"
                           url="/blade-los/bports/list?current=1&size=5" :filterable="true" :remote="true"
-                          dataName="cnName" @selectChange="dicChange('podCnName', $event)" :disabled="editDisabled||!flxDisabled"
-                          :slotRight="true" rightLabel="code"></dic-select>
-                        <el-input style="width: 100%;" v-model="form.podNamePrint" size="small" :disabled="editDisabled||!flxDisabled"
-                          clearable placeholder="卸货港" @change="textareaBlur2('podNamePrint', $event)"></el-input>
+                          dataName="cnName" @selectChange="dicChange('podCnName', $event)"
+                          :disabled="editDisabled || !flxDisabled" :slotRight="true" rightLabel="code"></dic-select>
+                        <el-input style="width: 100%;" v-model="form.podNamePrint" size="small"
+                          :disabled="editDisabled || !flxDisabled" clearable placeholder="卸货港"
+                          @change="textareaBlur2('podNamePrint', $event)"></el-input>
                       </el-form-item>
                     </el-col>
                   </el-row>
@@ -187,9 +189,9 @@
                         <dic-select v-model="form.placeDeliveryName" placeholder="交货地" key="id" label="cnName"
                           res="records" url="/blade-los/bports/list?current=1&size=5" :filterable="true" :remote="true"
                           dataName="cnName" @selectChange="dicChange('placeDeliveryName', $event)"
-                          :disabled="editDisabled||!flxDisabled" :slotRight="true" rightLabel="code"></dic-select>
+                          :disabled="editDisabled || !flxDisabled" :slotRight="true" rightLabel="code"></dic-select>
                         <el-input style="width: 100%;" v-model="form.placeDeliveryNamePrint" size="small"
-                          :disabled="editDisabled||!flxDisabled" clearable placeholder="交货地"
+                          :disabled="editDisabled || !flxDisabled" clearable placeholder="交货地"
                           @change="textareaBlur2('placeDeliveryNamePrint', $event)"></el-input>
                       </el-form-item>
                     </el-col>
@@ -310,11 +312,20 @@
                     </el-col>
                   </el-row>
                   <el-row>
-                    <el-form-item label="邮箱" prop="fileEmail"
-                      :rules="[{ required: true, message: ' ', trigger: 'blur' }]">
-                      <el-input style="width: 100%;" size="small" v-model="form.fileEmail" :disabled="editDisabled"
-                        placeholder="文件联络人邮箱"></el-input>
-                    </el-form-item>
+                    <el-col span="12">
+                      <el-form-item label="邮箱" prop="fileEmail"
+                        :rules="[{ required: true, message: ' ', trigger: 'blur' }]">
+                        <el-input style="width: 100%;" size="small" v-model="form.fileEmail" :disabled="editDisabled"
+                          placeholder="文件联络人邮箱"></el-input>
+                      </el-form-item>
+                    </el-col>
+                    <el-col span="12">
+                      <el-form-item label="电话" prop="fileTel"
+                        :rules="[{ required: true, message: ' ', trigger: 'blur' }]">
+                        <el-input style="width: 100%;" size="small" v-model="form.fileTel" :disabled="editDisabled"
+                          placeholder="文件联络人电话"></el-input>
+                      </el-form-item>
+                    </el-col>
                   </el-row>
                   <el-row>
                     <el-col span="12">
@@ -1890,6 +1901,7 @@ export default {
       }
       if (name == '提单修改') {
         this.flxDisabled = false
+        this.isSaveBtn = false
         this.editDisabled = false
         this.optionForm.disabled = false
       }

src/views/iosBasicData/businessCenter/customerBooking/index.vue

@@ -280,6 +280,42 @@ export default {
                         width: "120",
                         overHidden: true
                     },
+                   {
+                        label: "TEU",
+                        prop: "teu",
+                        width: "100",
+                        overHidden: true
+                    },
+                    {
+                        label: "20GP",
+                        prop: "quantityV20",
+                        width: "100",
+                        overHidden: true
+                    },
+                    {
+                        label: "40GP",
+                        prop: "quantityV40",
+                        width: "100",
+                        overHidden: true
+                    },
+                    {
+                        label: "20HC",
+                        prop: "quantityV45",
+                        width: "100",
+                        overHidden: true
+                    },
+                    {
+                        label: "40FR",
+                        prop: "quantityV48",
+                        width: "100",
+                        overHidden: true
+                    },
+                    {
+                        label: "40HC",
+                        prop: "quantityV40hc",
+                        width: "100",
+                        overHidden: true
+                    }, 
                     {
                         label: '件数',
                         prop: "quantity",

src/views/iosBasicData/businessCenter/customerLetter/detailsPage.vue

@@ -77,21 +77,21 @@
                       <el-row>
                         <el-form-item label="发货人" prop="hshipperDetails">
                           <el-input type="textarea" style="width: 100%;" v-model="form.detail.hshipperDetails"
-                            size="small" autocomplete="off" :disabled="editDisabled" :rows="5" clearable
+                            size="small" autocomplete="off" :disabled="editDisabled" :rows="6" clearable
                             placeholder="请输入发货人提单描述" @change="textareaBlur('hshipperDetails', $event)"></el-input>
                         </el-form-item>
                       </el-row>
                       <el-row>
                         <el-form-item label="收货人" prop="hconsigneeDetails">
                           <el-input type="textarea" style="width: 100%;" v-model="form.detail.hconsigneeDetails"
-                            size="small" autocomplete="off" :disabled="editDisabled" :rows="5" clearable
+                            size="small" autocomplete="off" :disabled="editDisabled" :rows="6" clearable
                             placeholder="请输入收货人提单描述" @change="textareaBlur('hconsigneeDetails', $event)"></el-input>
                         </el-form-item>
                       </el-row>
                       <el-row>
                         <el-form-item label="通知人" prop="hnotifyDetails">
                           <el-input type="textarea" style="width: 100%;" v-model="form.detail.hnotifyDetails"
-                            size="small" autocomplete="off" :disabled="editDisabled" :rows="5" clearable
+                            size="small" autocomplete="off" :disabled="editDisabled" :rows="6" clearable
                             placeholder="请输入通知人提单描述" @change="textareaBlur('hnotifyDetails', $event)"></el-input>
                         </el-form-item>
                       </el-row>
@@ -101,7 +101,7 @@
                         <el-form-item label="唛头" prop="marks"
                           :rules="[{ required: true, message: ' ', trigger: 'blur' }]">
                           <el-input type="textarea" style="width: 100%;" v-model="form.marks" size="small"
-                            autocomplete="off" :disabled="editDisabled" :rows="7" clearable placeholder="请输入唛头"
+                            autocomplete="off" :disabled="editDisabled" :rows="10" clearable placeholder="请输入唛头"
                             @change="textareaBlur2('marks', $event)"></el-input>
                         </el-form-item>
                       </el-row>
@@ -109,7 +109,7 @@
                         <el-form-item label="货物" prop="commodityDescr"
                           :rules="[{ required: true, message: ' ', trigger: 'blur' }]">
                           <el-input type="textarea" style="width: 100%;" v-model="form.commodityDescr" size="small"
-                            autocomplete="off" :disabled="editDisabled" :rows="9" clearable placeholder="请输入提单上货物描述"
+                            autocomplete="off" :disabled="editDisabled" :rows="10" clearable placeholder="请输入提单上货物描述"
                             @change="textareaBlur2('commodityDescr', $event)"></el-input>
                         </el-form-item>
                       </el-row>
@@ -284,6 +284,20 @@
                   </el-row>
                   <el-row>
                     <el-col span="12">
+                      <el-form-item label="邮箱" prop="fileEmail">
+                        <el-input style="width: 100%;" size="small" v-model="form.fileEmail" :disabled="editDisabled"
+                          placeholder="文件联络人邮箱"></el-input>
+                      </el-form-item>
+                    </el-col>
+                    <el-col span="12">
+                      <el-form-item label="电话" prop="fileTel">
+                        <el-input style="width: 100%;" size="small" v-model="form.fileTel" :disabled="editDisabled"
+                          placeholder="文件联络人电话"></el-input>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                  <el-row>
+                    <el-col span="12">
                       <el-form-item label="订舱备注" prop="cyRemarks">
                         <el-input type="textarea" style="width: 100%;" v-model="form.cyRemarks" size="small"
                           autocomplete="off" :disabled="editDisabled" :rows="2" clearable placeholder="请输入备注"

src/views/iosBasicData/businessCenter/customerLetter/index.vue

@@ -190,6 +190,42 @@ export default {
                         width: "80",
                         overHidden: true,
                     },
+                      {
+                        label: "TEU",
+                        prop: "teu",
+                        width: "100",
+                        overHidden: true
+                    },
+                    {
+                        label: "20GP",
+                        prop: "quantityV20",
+                        width: "100",
+                        overHidden: true
+                    },
+                    {
+                        label: "40GP",
+                        prop: "quantityV40",
+                        width: "100",
+                        overHidden: true
+                    },
+                    {
+                        label: "20HC",
+                        prop: "quantityV45",
+                        width: "100",
+                        overHidden: true
+                    },
+                    {
+                        label: "40FR",
+                        prop: "quantityV48",
+                        width: "100",
+                        overHidden: true
+                    },
+                    {
+                        label: "40HC",
+                        prop: "quantityV40hc",
+                        width: "100",
+                        overHidden: true
+                    }, 
                     // {
                     //     label: "单据状态",
                     //     prop: "issueStatus",

src/views/iosBasicData/costcenter/coc/index.vue

@@ -28,7 +28,9 @@
                     </el-button>
                     <el-button type="danger" size="small" @click="batchRevoke" :disabled="!selectionList.length">撤销
                     </el-button>
-
+                    <el-button type="success" size="small" :disabled="selectionList.length == 0"
+                        @click="allClick('批量复制')">批量复制
+                    </el-button>
                 </template>
                 <template slot="menu" slot-scope="{ row, index }">
                     <el-button size="small" icon="el-icon-edit" type="text" @click="rowEdit(row)">编辑</el-button>
@@ -48,20 +50,101 @@
                 </template>
             </avue-crud>
         </basic-container>
+        <el-dialog title="导入模板" append-to-body :visible.sync="copyDia" width="555px" :close-on-click-modal="false"
+            v-dialog-drag>
+            <avue-form v-if="copyDia" ref="copy" :option="copyOption" v-model="copyForm">
+                <template slot="curCode">
+                    <dic-select v-model="copyForm.curCode" placeholder="币别" label="code"
+                        :url="'/blade-los/bcurrency/obtainRate?deptId=' + copyForm.deptId + '&date=' + copyForm.effectiveStartDate + '&type=1'"
+                        :filterable="true" @selectChange="dicChange('curCode', $event)"></dic-select>
+                </template>
+            </avue-form>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="copyDia = false" size="mini">取 消</el-button>
+                <el-button type="primary" @click="allClick('确认复制')" size="mini">确 定</el-button>
+            </span>
+        </el-dialog>
         <detailsPage v-if="!isShow" :detailData="detailData" :pageIds="pageIds" @goBack="goBack"></detailsPage>
     </div>
 </template>
 
 <script>
-import { getList, remove, checkBillsBatch, batchRevoke } from "@/api/iosBasicData/costcenter/coc";
+import { getList, remove, checkBillsBatch, batchRevoke, batchCopy } from "@/api/iosBasicData/costcenter/coc";
 import { getWorkDicts } from "@/api/system/dictbiz";
 import detailsPage from "./detailsPage";
 import { getToken } from "@/util/auth";
 import { dateFormat } from "@/util/date";
+import dicSelect from "@/components/dicSelect/main";
 import _ from "lodash";
 export default {
     data() {
         return {
+            copyForm: {
+                deptId: JSON.parse(localStorage.getItem('sysitemData')).deptId,
+                effectiveStartDate: dateFormat(new Date(), 'yyyy-MM-dd') + ' 00:00:00',
+            },
+            copyDia: false,
+            copyOption: {
+                submitBtn: false,
+                emptyBtn: false,
+                column: [
+                    {
+                        label: "有效期起",
+                        prop: "effectiveStartDate",
+                        width: "120",
+                        disabled: false,
+                        type: "date",
+                        format: "yyyy-MM-dd",
+                        valueFormat: "yyyy-MM-dd 00:00:00",
+                        rules: [{
+                            required: true,
+                            message: "请选择日期",
+                            trigger: "blur"
+                        }]
+                    },
+                    {
+                        label: "有效期止",
+                        prop: "effectiveEndDate",
+                        width: "120",
+                        disabled: false,
+                        type: "date",
+                        format: "yyyy-MM-dd",
+                        valueFormat: "yyyy-MM-dd 23:59:59",
+                        rules: [{
+                            required: true,
+                            message: "请选择日期",
+                            trigger: "blur"
+                        }]
+                    },
+                    {
+                        label: "币别",
+                        prop: "curCode",
+                        width: "80",
+                        disabled: false,
+                        rules: [
+                            {
+                                required: true,
+                                message: ' ',
+                                trigger: 'blur'
+                            }
+                        ]
+                    },
+                    {
+                        label: "汇率",
+                        prop: "exrate",
+                        width: "80",
+                        disabled: false,
+                        rules: [
+                            {
+                                required: true,
+                                message: ' ',
+                                trigger: 'blur'
+                            }
+                        ]
+                    },
+                ]
+
+            },
             isShow: true,
             form: {},
             query: {
@@ -329,7 +412,8 @@ export default {
         };
     },
     components: {
-        detailsPage
+        detailsPage,
+        dicSelect
     },
     async created() {
         this.option = await this.getColumnData(this.getColumnName(451), this.optionBack);
@@ -342,6 +426,54 @@ export default {
         }, 100);
     },
     methods: {
+        dicChange(name, row) {
+            if (name == 'curCode') {
+                if (row) {
+                    console.log(row)
+                    this.copyForm.exrate = row.exrateReceivable
+                } else {
+                    this.copyForm.exrate = null
+                }
+            }
+        },
+        allClick(name) {
+            if (name == '批量复制') {
+                this.copyForm = this.$options.data().copyForm;
+                this.copyDia = true
+            }
+            if (name == '确认复制') {
+                this.$refs["copy"].validate((valid, done) => {
+                    done();
+                    if (valid) {
+                        let ids = []
+                        for (let item of this.selectionList) {
+                            ids.push(item.id)
+                        }
+                        let obj = {
+                            ids: ids.join(','),
+                            ...this.copyForm,
+                            type: 'COC',
+                        }
+                        const loading = this.$loading({
+                            lock: true,
+                            text: '加载中',
+                            spinner: 'el-icon-loading',
+                            background: 'rgba(255,255,255,0.7)'
+                        });
+                        batchCopy(obj).then(res => {
+                            this.$message.success("操作成功");
+                            this.copyDia = false
+                            this.onLoad(this.page, this.query);
+                        }).finally(() => {
+                            loading.close()
+                        })
+
+                    } else {
+                        return false;
+                    }
+                });
+            }
+        },
         checkBills() {
             for (let item of this.selectionList) {
                 if (item.status != '录入') {

src/views/iosBasicData/costcenter/soc/index.vue

@@ -28,6 +28,9 @@
                     </el-button>
                     <el-button type="danger" size="small" @click="batchRevoke" :disabled="!selectionList.length">撤销
                     </el-button>
+                    <el-button type="success" size="small" :disabled="selectionList.length == 0"
+                        @click="allClick('批量复制')">批量复制
+                    </el-button>
                 </template>
                 <template slot="menu" slot-scope="{ row, index }">
                     <el-button size="small" icon="el-icon-edit" type="text" @click="rowEdit(row)">编辑</el-button>
@@ -40,27 +43,108 @@
                 <template slot="status" slot-scope="{ row }">
                     <span v-if="row.status == '录入'"
                         style="color: #fff;border-radius: 30px;padding: 2px 15px;background-color: #409EFF;">{{
-                        row.status }}</span>
+                            row.status }}</span>
                     <span v-if="row.status != '录入'"
                         style="color: #fff;border-radius: 30px;padding: 2px 15px;background-color: #67C23A;">{{
-                        row.status }}</span>
+                            row.status }}</span>
                 </template>
             </avue-crud>
         </basic-container>
+        <el-dialog title="导入模板" append-to-body :visible.sync="copyDia" width="555px" :close-on-click-modal="false"
+            v-dialog-drag>
+            <avue-form v-if="copyDia" ref="copy" :option="copyOption" v-model="copyForm">
+                <template slot="curCode">
+                    <dic-select v-model="copyForm.curCode" placeholder="币别" label="code"
+                        :url="'/blade-los/bcurrency/obtainRate?deptId=' + copyForm.deptId + '&date=' + copyForm.effectiveStartDate + '&type=1'"
+                        :filterable="true" @selectChange="dicChange('curCode', $event)"></dic-select>
+                </template>
+            </avue-form>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="copyDia = false" size="mini">取 消</el-button>
+                <el-button type="primary" @click="allClick('确认复制')" size="mini">确 定</el-button>
+            </span>
+        </el-dialog>
         <detailsPage v-if="!isShow" :detailData="detailData" :pageIds="pageIds" @goBack="goBack"></detailsPage>
     </div>
 </template>
 
 <script>
-import { getList, remove, checkBillsBatch, batchRevoke } from "@/api/iosBasicData/costcenter/soc";
+import { getList, remove, checkBillsBatch, batchRevoke, batchCopy } from "@/api/iosBasicData/costcenter/soc";
 import { getWorkDicts } from "@/api/system/dictbiz";
 import detailsPage from "./detailsPage";
 import { getToken } from "@/util/auth";
 import { dateFormat } from "@/util/date";
+import dicSelect from "@/components/dicSelect/main";
 import _ from "lodash";
 export default {
     data() {
         return {
+            copyForm: {
+                deptId: JSON.parse(localStorage.getItem('sysitemData')).deptId,
+                effectiveStartDate: dateFormat(new Date(), 'yyyy-MM-dd') + ' 00:00:00',
+            },
+            copyDia: false,
+            copyOption: {
+                submitBtn: false,
+                emptyBtn: false,
+                column: [
+                    {
+                        label: "有效期起",
+                        prop: "effectiveStartDate",
+                        width: "120",
+                        disabled: false,
+                        type: "date",
+                        format: "yyyy-MM-dd",
+                        valueFormat: "yyyy-MM-dd 00:00:00",
+                        rules: [{
+                            required: true,
+                            message: "请选择日期",
+                            trigger: "blur"
+                        }]
+                    },
+                    {
+                        label: "有效期止",
+                        prop: "effectiveEndDate",
+                        width: "120",
+                        disabled: false,
+                        type: "date",
+                        format: "yyyy-MM-dd",
+                        valueFormat: "yyyy-MM-dd 23:59:59",
+                        rules: [{
+                            required: true,
+                            message: "请选择日期",
+                            trigger: "blur"
+                        }]
+                    },
+                    {
+                        label: "币别",
+                        prop: "curCode",
+                        width: "80",
+                        disabled: false,
+                        rules: [
+                            {
+                                required: true,
+                                message: ' ',
+                                trigger: 'blur'
+                            }
+                        ]
+                    },
+                    {
+                        label: "汇率",
+                        prop: "exrate",
+                        width: "80",
+                        disabled: false,
+                        rules: [
+                            {
+                                required: true,
+                                message: ' ',
+                                trigger: 'blur'
+                            }
+                        ]
+                    },
+                ]
+
+            },
             isShow: true,
             detailData: {},
             form: {},
@@ -350,7 +434,8 @@ export default {
         };
     },
     components: {
-        detailsPage
+        detailsPage,
+        dicSelect
     },
     async created() {
         this.option = await this.getColumnData(this.getColumnName(446), this.optionBack);
@@ -363,6 +448,54 @@ export default {
         }, 100);
     },
     methods: {
+        dicChange(name, row) {
+            if (name == 'curCode') {
+                if (row) {
+                    console.log(row)
+                    this.copyForm.exrate = row.exrateReceivable
+                } else {
+                    this.copyForm.exrate = null
+                }
+            }
+        },
+        allClick(name) {
+            if (name == '批量复制') {
+                this.copyForm = this.$options.data().copyForm;
+                this.copyDia = true
+            }
+            if (name == '确认复制') {
+                this.$refs["copy"].validate((valid, done) => {
+                    done();
+                    if (valid) {
+                        let ids = []
+                        for (let item of this.selectionList) {
+                            ids.push(item.id)
+                        }
+                        let obj = {
+                            ids: ids.join(','),
+                            ...this.copyForm,
+                            type: 'SOC',
+                        }
+                        const loading = this.$loading({
+                            lock: true,
+                            text: '加载中',
+                            spinner: 'el-icon-loading',
+                            background: 'rgba(255,255,255,0.7)'
+                        });
+                        batchCopy(obj).then(res => {
+                            this.$message.success("操作成功");
+                            this.copyDia = false
+                            this.onLoad(this.page, this.query);
+                        }).finally(() => {
+                            loading.close()
+                        })
+
+                    } else {
+                        return false;
+                    }
+                });
+            }
+        },
         checkBills() {
             for (let item of this.selectionList) {
                 if (item.status != '录入') {

src/views/iosBasicData/financialManagement/PaymentApplication/detailsPage.vue

@@ -20,8 +20,7 @@
                 <el-button size="small" type="success" plain :disabled="!form.id"
                     v-if="form.status == '0' || form.status == '4'" @click="allClick('提交申请')">提交申请
                 </el-button>
-                <el-button size="small" type="danger" plain :disabled="!form.id || editPower"
-                    v-if="form.status == '3'"
+                <el-button size="small" type="danger" plain :disabled="!form.id || editPower" v-if="form.status == '3'"
                     @click="allClick('撤销申请')">撤销申请
                 </el-button>
                 <el-button size="small" type="primary" style="margin-right: 8px" v-if="editButton" @click="inEdit">编 辑
@@ -62,6 +61,18 @@
                                             @selectChange="dicChange('corpCnName', $event)">
                                         </dic-select>
                                     </tempalte>
+                                    <template slot="curCode">
+                                        <dic-select v-model="form.curCode" placeholder="币别" label="code"
+                                            :url="'/blade-los/bcurrency/obtainRate?deptId=' + form.branchId + '&date=' + form.billDate + '&type=2'"
+                                            :filterable="true" @selectChange="dicChange('curCode', $event)"
+                                            :disabled="editDisabled"></dic-select>
+                                    </template>
+                                    <tempalte slot="isExchangeToCny">
+                                        <el-checkbox size="medium" true-label="1" false-label="0"
+                                            :disabled="editDisabled || form.finStlBillsItemsList.length"
+                                            v-model="form.isExchangeToCny">
+                                        </el-checkbox>
+                                    </tempalte>
                                     <tempalte slot="remarks">
                                         <el-input type="textarea" :rows="5" placeholder="请输入 备注" v-model="form.remarks">
                                         </el-input>
@@ -100,6 +111,9 @@
                                             <span style="color: #E6A23C;margin-right: 10px;">
                                                 应付外币:{{ form.amountCrUsd || 0 }}元
                                             </span>
+                                            <span style="color: #E6A23C;margin-right: 10px;">
+                                                总合计:{{ form.amountSubLoc || 0 }}元
+                                            </span>
                                         </span>
                                     </template>
                                 </avue-crud>
@@ -173,8 +187,8 @@
                                         </span>
                                     </template>
                                     <tempalte slot="appliedCurrentStlAmount" slot-scope="{ row }">
-                                        <el-input-number v-model="row.appliedCurrentStlAmount"
-                                            @change="armbChange(row)" :controls="false" placeholder="请输入 金额" size="mini"
+                                        <el-input-number v-model="row.appliedCurrentStlAmount" @change="armbChange(row)"
+                                            :controls="false" placeholder="请输入 金额" size="mini"
                                             style="width: 100%;"></el-input-number>
                                     </tempalte>
                                 </avue-crud>
@@ -311,8 +325,22 @@ export default {
                         disabled: false
                     },
                     {
+                        label: "币别",
+                        prop: "curCode",
+                        span: 12,
+                        disabled: false
+                    },
+                    {
+                        label: "汇率",
+                        prop: "exrate",
+                        span: 12,
+                        labelWidth: 80,
+                        disabled: false
+                    },
+                    {
                         label: '申请日期',
                         prop: 'billDate',
+                        span: 16,
                         type: "date",
                         format: "yyyy-MM-dd",
                         valueFormat: "yyyy-MM-dd 00:00:00",
@@ -324,6 +352,13 @@ export default {
                         disabled: false
                     },
                     {
+                        label: "转换成本币",
+                        prop: "isExchangeToCny",
+                        span: 8,
+                        labelWidth: 80,
+                        disabled: false
+                    },
+                    {
                         label: '单据编号',
                         prop: 'billNo',
                         disabled: true
@@ -879,9 +914,7 @@ export default {
                 this.form.businessTypeCode = 'FFSQ'
                 this.form.businessType = 'FFSQ' // 结算单
                 let obj = {
-                    ...this.form,
-                    dc: this.search.accountDc,
-                    curCode: this.search.curCode // 币别
+                    ...this.form
                 }
                 finstlbillsAdd(obj)
                 this.finstlbillslistAccBillV1fun()
@@ -1059,7 +1092,7 @@ export default {
         upDate(list) {
             this.form.fileList = list
         },
-        dicChange(name, row) {
+        async dicChange(name, row) {
             if (name == 'branchName') {
                 if (row) {
                     this.form.branchId = row.id
@@ -1080,7 +1113,10 @@ export default {
                     this.form.corpCnName = null
                     this.form.corpArgreementNo = null
                 }
-
+            }
+            if (name == 'curCode') {
+                await this.checkRate(row.code, this.form.billDate, null, 2, this.form.branchId)
+                this.$set(this.form, 'exrate', this.getExchangeRate(row.code, 'C', 2))
             }
         },
         // 打印
@@ -1137,9 +1173,7 @@ export default {
                 this.form.businessTypeCode = 'FFSQ'
                 this.form.businessType = 'FFSQ' // 结算单
                 let obj = {
-                    ...this.form,
-                    dc: this.search.accountDc,
-                    curCode: this.search.curCode // 币别
+                    ...this.form
                 }
                 const loading = this.$loading({
                     lock: true,
@@ -1174,8 +1208,6 @@ export default {
                     this.optionForm.disabled = false
                 }
                 this.form = res.data.data
-                this.search.accountDc = res.data.data.dc
-                this.search.curCode = res.data.data.curCode
                 this.page.total = res.data.data.finStlBillsItemsList.length
                 this.saveLocalCurrency(res.data.data.branchId)
                 if (type == 'search1') {
@@ -1201,9 +1233,7 @@ export default {
             this.form.businessTypeCode = 'FFSQ'
             this.form.businessType = 'FFSQ' // 结算单
             let obj = {
-                ...this.form,
-                dc: this.search.accountDc,
-                curCode: this.search.curCode // 币别
+                ...this.form
             }
             finstlbillsAdd(obj).then(res => {
                 this.finstlbillslistAccBillV1fun()

src/views/iosBasicData/financialManagement/computationCenter/detailsPage.vue

@@ -52,6 +52,12 @@
                                             @selectChange="dicChange('corpCnName', $event)">
                                         </dic-select>
                                     </tempalte>
+                                    <template slot="curCode">
+                                        <dic-select v-model="form.curCode" placeholder="币别" label="code"
+                                            :url="'/blade-los/bcurrency/obtainRate?deptId=' + form.branchId + '&date=' + form.billDate + '&type=2'"
+                                            :filterable="true" @selectChange="dicChange('curCode', $event)"
+                                            :disabled="editDisabled"></dic-select>
+                                    </template>
                                     <tempalte slot="isExchangeToCny">
                                         <el-checkbox size="medium" true-label="1" false-label="0"
                                             :disabled="editDisabled || form.finStlBillsItemsList.length"
@@ -98,6 +104,9 @@
                                             <span style="color: #E6A23C;margin-right: 10px;">
                                                 应付外币:{{ form.amountCrUsd || 0 }}元
                                             </span>
+                                            <span style="color: #E6A23C;margin-right: 10px;">
+                                                总合计:{{ form.amountSubLoc || 0 }}元
+                                            </span>
                                         </span>
                                     </template>
                                 </avue-crud>
@@ -283,6 +292,7 @@ export default {
                 branchName: JSON.parse(localStorage.getItem('sysitemData')).deptName,
                 billDate: dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00', // 结算日期 默认 当天
                 isExchangeToCny: '0',
+                dc: 'D',
                 finStlBillsItemsList: [],
                 fileList: []
             },
@@ -314,12 +324,42 @@ export default {
                         disabled: false
                     },
                     {
+                        label: "币别",
+                        prop: "curCode",
+                        span: 12,
+                        disabled: false
+                    },
+                    {
+                        label: "汇率",
+                        prop: "exrate",
+                        span: 12,
+                        labelWidth: 80,
+                        disabled: false
+                    },
+                    {
+                        label: "收/付",
+                        prop: "dc",
+                        span: 12,
+                        type: 'select',
+                        dicData: [
+                            {
+                                label: '收',
+                                value: 'D'
+                            },
+                            {
+                                label: '付',
+                                value: 'C'
+                            }
+                        ],
+                        disabled: false
+                    },
+                    {
                         label: '结算日期',
                         prop: 'billDate',
                         type: "date",
                         format: "yyyy-MM-dd",
                         valueFormat: "yyyy-MM-dd 00:00:00",
-                        span: 16,
+                        span: 12,
                         rules: [{
                             required: true,
                             message: " ",
@@ -328,6 +368,12 @@ export default {
                         disabled: false
                     },
                     {
+                        label: '单据编号',
+                        prop: 'billNo',
+                        span: 16,
+                        disabled: true
+                    },
+                    {
                         label: "转换成本币",
                         prop: "isExchangeToCny",
                         span: 8,
@@ -335,11 +381,6 @@ export default {
                         disabled: false
                     },
                     {
-                        label: '单据编号',
-                        prop: 'billNo',
-                        disabled: true
-                    },
-                    {
                         label: '备注',
                         prop: 'remarks',
                         type: 'textarea',
@@ -887,9 +928,7 @@ export default {
                 this.form.businessTypeCode = 'STL'
                 this.form.businessType = 'STL' // 结算
                 let obj = {
-                    ...this.form,
-                    dc: this.search.accountDc,
-                    curCode: this.search.curCode // 币别
+                    ...this.form
                 }
                 finstlbillsAdd(obj)
                 this.finstlbillslistAccBillV1fun()
@@ -1126,7 +1165,7 @@ export default {
         upDate(list) {
             this.form.fileList = list
         },
-        dicChange(name, row) {
+        async dicChange(name, row) {
             if (name == 'branchName') {
                 if (row) {
                     this.form.branchId = row.id
@@ -1149,6 +1188,10 @@ export default {
                 }
 
             }
+            if (name == 'curCode') {
+                await this.checkRate(row.code, this.form.billDate, null, 2, this.form.branchId)
+                this.$set(this.form, 'exrate', this.getExchangeRate(row.code, this.form.dc ? this.form.dc : 'D', 2))
+            }
         },
         // 打印
         reportRadio(val) {
@@ -1204,9 +1247,7 @@ export default {
                 this.form.businessTypeCode = 'STL'
                 this.form.businessType = 'STL' // 结算
                 let obj = {
-                    ...this.form,
-                    dc: this.search.accountDc,
-                    curCode: this.search.curCode // 币别
+                    ...this.form
                 }
                 const loading = this.$loading({
                     lock: true,
@@ -1277,8 +1318,6 @@ export default {
                     })
                 }
                 this.form = res.data.data
-                this.search.accountDc = res.data.data.dc
-                this.search.curCode = res.data.data.curCode
                 this.page.total = res.data.data.finStlBillsItemsList.length
                 this.saveLocalCurrency(res.data.data.branchId)
                 if (type == 'search1') {
@@ -1304,8 +1343,6 @@ export default {
             this.form.businessType = 'STL' // 结算
             let obj = {
                 ...this.form,
-                dc: this.search.accountDc,
-                curCode: this.search.curCode // 币别
             }
             finstlbillsAdd(obj).then(res => {
                 this.finstlbillslistAccBillV1fun()

src/views/iosBasicData/financialManagement/computationCenter/index.vue

@@ -234,6 +234,23 @@ export default {
                         search: true,
                         overHidden: true,
                     },
+
+                    {
+                        label: "币别",
+                        prop: "curCode",
+                        width: 60,
+                        search: true,
+                        type: 'select',
+                        filterable: true,
+                        remote: true,
+                        dicUrl: "/api/blade-los/bcurrency/page?current=1&size=5&corpTypeName=箱东&shortName={{key}}",
+                        props: {
+                            label: 'code',
+                            value: 'code',
+                            res: 'data.records'
+                        },
+                        overHidden: true
+                    },
                     // {
                     //     label: "申请人",
                     //     prop: "createUserName",

src/views/iosBasicData/financialManagement/fininvoicesApplyfor/index.vue

@@ -90,7 +90,7 @@ export default {
         calcHeight: 30,
         tip: false,
         searchShow: true,
-        searchMenuSpan: 18,
+        searchMenuSpan: 12,
         searchIcon: true,
         searchIndex: 3,
         border: true,
@@ -158,6 +158,23 @@ export default {
             }],
             overHidden: true,
           },
+          
+          {
+            label: "币别",
+            prop: "curCode",
+            width: 60,
+            search: true,
+            type: 'select',
+            filterable: true,
+            remote: true,
+            dicUrl: "/api/blade-los/bcurrency/page?current=1&size=5&corpTypeName=箱东&shortName={{key}}",
+            props: {
+              label: 'code',
+              value: 'code',
+              res: 'data.records'
+            },
+            overHidden: true
+          },
           {
             label: "发票本币",
             prop: "amountCny",
@@ -656,7 +673,7 @@ export default {
     this.saberUserInfo = JSON.parse(localStorage.getItem('saber-userInfo')).content
     this.option = await this.getColumnData(this.getColumnName(320), this.optionBack);
     if (this.saberUserInfo.role_name.indexOf('admin') != -1 || this.saberUserInfo.role_name.indexOf('总部') != -1) {
-      this.option.searchMenuSpan = 12
+      this.option.searchMenuSpan = 6
       this.option.column.forEach(item => {
         if (item.prop == 'branchId') {
           item.search = true
@@ -907,7 +924,7 @@ export default {
       this[option] = this[optionBack];
       const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
       if (this.saberUserInfo.role_name.indexOf('admin') != -1 || this.saberUserInfo.role_name.indexOf('总部') != -1) {
-        this.option.searchMenuSpan = 12
+        this.option.searchMenuSpan = 6
         this.option.column.forEach(item => {
           if (item.prop == 'branchId') {
             item.search = true

src/views/iosBasicData/financialManagement/fininvoicesOutput/index.vue

@@ -345,7 +345,7 @@ export default {
                 calcHeight: 30,
                 tip: false,
                 searchShow: true,
-                searchMenuSpan: 18,
+                searchMenuSpan: 12,
                 searchIcon: true,
                 searchIndex: 3,
                 border: true,
@@ -406,6 +406,22 @@ export default {
                         overHidden: true
                     },
                     {
+                        label: "币别",
+                        prop: "curCode",
+                        width: 60,
+                        search: true,
+                        type: 'select',
+                        filterable: true,
+                        remote: true,
+                        dicUrl: "/api/blade-los/bcurrency/page?current=1&size=5&corpTypeName=箱东&shortName={{key}}",
+                        props: {
+                            label: 'code',
+                            value: 'code',
+                            res: 'data.records'
+                        },
+                        overHidden: true
+                    },
+                    {
                         label: "发票本币",
                         prop: "amountCny",
                         width: "140",
@@ -603,36 +619,36 @@ export default {
                     //     width: "150",
                     //     overHidden: true,
                     // },
-/*                    {
-                        label: "开票单位税号",
-                        prop: "invCorpTaxNo",
-                        width: "140",
-                        overHidden: true,
-                    },
-                    {
-                        label: "开票单位本币开户银行",
-                        prop: "invCorpAccountBankCny",
-                        width: "160",
-                        overHidden: true,
-                    },
-                    {
-                        label: "开票单位外币银行账号",
-                        prop: "invCorpAccountNoCny",
-                        width: "160",
-                        overHidden: true,
-                    },
-                    {
-                        label: "开票单位外币开户银行",
-                        prop: "invCorpAccountBankUsd",
-                        width: "160",
-                        overHidden: true,
-                    },
-                    {
-                        label: "开票单位外币银行账号",
-                        prop: "invCorpAccountNoUsd",
-                        width: "160",
-                        overHidden: true,
-                    },*/
+                    /*                    {
+                                            label: "开票单位税号",
+                                            prop: "invCorpTaxNo",
+                                            width: "140",
+                                            overHidden: true,
+                                        },
+                                        {
+                                            label: "开票单位本币开户银行",
+                                            prop: "invCorpAccountBankCny",
+                                            width: "160",
+                                            overHidden: true,
+                                        },
+                                        {
+                                            label: "开票单位外币银行账号",
+                                            prop: "invCorpAccountNoCny",
+                                            width: "160",
+                                            overHidden: true,
+                                        },
+                                        {
+                                            label: "开票单位外币开户银行",
+                                            prop: "invCorpAccountBankUsd",
+                                            width: "160",
+                                            overHidden: true,
+                                        },
+                                        {
+                                            label: "开票单位外币银行账号",
+                                            prop: "invCorpAccountNoUsd",
+                                            width: "160",
+                                            overHidden: true,
+                                        },*/
                     {
                         label: "船名/航次",
                         prop: "vesselVoyno",
@@ -670,11 +686,11 @@ export default {
                         prop: "curCode",
                         overHidden: true,
                     },
-    /*                {
-                        label: "原汇率",
-                        prop: "exrate",
-                        overHidden: true,
-                    },*/
+                    /*                {
+                                        label: "原汇率",
+                                        prop: "exrate",
+                                        overHidden: true,
+                                    },*/
                     {
                         label: "是否转换为人民币",
                         prop: "isExchangeToCny",
@@ -705,11 +721,11 @@ export default {
                         width: "120",
                         overHidden: true,
                     },
-  /*                  {
-                        label: "订舱",
-                        prop: "bookingNo",
-                        overHidden: true,
-                    },*/
+                    /*                  {
+                                          label: "订舱",
+                                          prop: "bookingNo",
+                                          overHidden: true,
+                                      },*/
                     // {
                     //     label: "中文船名",
                     //     prop: "vesselCnName",
@@ -747,19 +763,19 @@ export default {
                         prop: "approverName",
                         overHidden: true,
                     },
-/*                    {
-                        label: "是否代理发票",
-                        prop: "isAgent",
-                        width: "120",
-                        dicData: [{
-                            label: '否',
-                            value: 0
-                        }, {
-                            label: '是',
-                            value: 1
-                        }],
-                        overHidden: true,
-                    },*/
+                    /*                    {
+                                            label: "是否代理发票",
+                                            prop: "isAgent",
+                                            width: "120",
+                                            dicData: [{
+                                                label: '否',
+                                                value: 0
+                                            }, {
+                                                label: '是',
+                                                value: 1
+                                            }],
+                                            overHidden: true,
+                                        },*/
                     {
                         label: "是否DK",
                         prop: "isDk",
@@ -772,23 +788,23 @@ export default {
                         }],
                         overHidden: true,
                     },
-/*                    {
-                        label: "是否RP",
-                        prop: "isRp",
-                        dicData: [{
-                            label: '否',
-                            value: 0
-                        }, {
-                            label: '是',
-                            value: 1
-                        }],
-                        overHidden: true,
-                    },
-                    {
-                        label: "RP名称",
-                        prop: "rpName",
-                        overHidden: true,
-                    },*/
+                    /*                    {
+                                            label: "是否RP",
+                                            prop: "isRp",
+                                            dicData: [{
+                                                label: '否',
+                                                value: 0
+                                            }, {
+                                                label: '是',
+                                                value: 1
+                                            }],
+                                            overHidden: true,
+                                        },
+                                        {
+                                            label: "RP名称",
+                                            prop: "rpName",
+                                            overHidden: true,
+                                        },*/
                     {
                         label: "导出日期",
                         prop: "exportDate",
@@ -800,52 +816,52 @@ export default {
                         prop: "exportName",
                         overHidden: true,
                     },
-/*                    {
-                        label: "是否导出船名航次",
-                        prop: "isExportVslvoy",
-                        width: "140",
-                        dicData: [{
-                            label: '否',
-                            value: 0
-                        }, {
-                            label: '是',
-                            value: 1
-                        }],
-                        overHidden: true,
-                    },*/
-/*                    {
-                        label: "是否导出主单号",
-                        prop: "isExportMblno",
-                        width: "140",
-                        dicData: [{
-                            label: '否',
-                            value: 0
-                        }, {
-                            label: '是',
-                            value: 1
-                        }],
-                        overHidden: true,
-                    },
-                    {
-                        label: "是否导出分单号",
-                        prop: "isExportHblno",
-                        width: "140",
-                        dicData: [{
-                            label: '否',
-                            value: 0
-                        }, {
-                            label: '是',
-                            value: 1
-                        }],
-                        overHidden: true,
-                    },*/
+                    /*                    {
+                                            label: "是否导出船名航次",
+                                            prop: "isExportVslvoy",
+                                            width: "140",
+                                            dicData: [{
+                                                label: '否',
+                                                value: 0
+                                            }, {
+                                                label: '是',
+                                                value: 1
+                                            }],
+                                            overHidden: true,
+                                        },*/
+                    /*                    {
+                                            label: "是否导出主单号",
+                                            prop: "isExportMblno",
+                                            width: "140",
+                                            dicData: [{
+                                                label: '否',
+                                                value: 0
+                                            }, {
+                                                label: '是',
+                                                value: 1
+                                            }],
+                                            overHidden: true,
+                                        },
+                                        {
+                                            label: "是否导出分单号",
+                                            prop: "isExportHblno",
+                                            width: "140",
+                                            dicData: [{
+                                                label: '否',
+                                                value: 0
+                                            }, {
+                                                label: '是',
+                                                value: 1
+                                            }],
+                                            overHidden: true,
+                                        },*/
 
-/*                    {
-                        label: "税额",
-                        prop: "amountTax",
-                        width: "100",
-                        overHidden: true,
-                    },*/
+                    /*                    {
+                                            label: "税额",
+                                            prop: "amountTax",
+                                            width: "100",
+                                            overHidden: true,
+                                        },*/
                     {
                         label: "全电发票备注",
                         prop: "elecRemarks",
@@ -858,36 +874,36 @@ export default {
                     //     width: "160",
                     //     overHidden: true,
                     // },
-/*                    {
-                        label: "银行进账单出票银行",
-                        prop: "bankReceiptBankName",
-                        width: "160",
-                        overHidden: true,
-                    },
-                    {
-                        label: "银行进账单出票银行账号",
-                        prop: "bankReceiptAccountNo",
-                        width: "160",
-                        overHidden: true,
-                    },*/
+                    /*                    {
+                                            label: "银行进账单出票银行",
+                                            prop: "bankReceiptBankName",
+                                            width: "160",
+                                            overHidden: true,
+                                        },
+                                        {
+                                            label: "银行进账单出票银行账号",
+                                            prop: "bankReceiptAccountNo",
+                                            width: "160",
+                                            overHidden: true,
+                                        },*/
                     // {
                     //     label: "银行进账单票据种类",
                     //     prop: "bankReceiptBillType",
                     //     width: "160",
                     //     overHidden: true,
                     // },
-/*                    {
-                        label: "银行进账单票据张数",
-                        prop: "bankReceiptBillCount",
-                        width: "160",
-                        overHidden: true,
-                    },
-                    {
-                        label: "银行进账单是否已进账(收款)",
-                        prop: "bankReceiptIsIncome",
-                        width: "180",
-                        overHidden: true,
-                    },*/
+                    /*                    {
+                                            label: "银行进账单票据张数",
+                                            prop: "bankReceiptBillCount",
+                                            width: "160",
+                                            overHidden: true,
+                                        },
+                                        {
+                                            label: "银行进账单是否已进账(收款)",
+                                            prop: "bankReceiptIsIncome",
+                                            width: "180",
+                                            overHidden: true,
+                                        },*/
                     {
                         label: "备注",
                         prop: "remarks",
@@ -934,7 +950,7 @@ export default {
         this.applyOption = await this.getColumnData(this.getColumnName(319), this.applyOptionBack);
         this.option = await this.getColumnData(this.getColumnName(319.1), this.optionBack);
         if (this.saberUserInfo.role_name.indexOf('admin') != -1 || this.saberUserInfo.role_name.indexOf('总部') != -1) {
-            this.option.searchMenuSpan = 12
+            this.option.searchMenuSpan = 6
             this.option.column.forEach(item => {
                 if (item.prop == 'branchId') {
                     item.search = true
@@ -1049,7 +1065,7 @@ export default {
                 menuPosition: 'right',
                 data: {
                     invoiceDate: dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00',
-                    exrate:this.applySelectionList[0].exrate
+                    exrate: this.applySelectionList[0].exrate
                 },
                 option: {
                     submitText: '确定',
@@ -1094,7 +1110,7 @@ export default {
                     })
                     this.isShow = false
                     this.$nextTick(() => {
-                        this.$refs.details.generateFinInvoices(arrId.join(","),res.data)
+                        this.$refs.details.generateFinInvoices(arrId.join(","), res.data)
                     })
                     this.$store.commit("IN_FINOUT_DETAIL");
                     res.close()
@@ -1374,7 +1390,7 @@ export default {
             this[option] = this[optionBack];
             const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
             if (this.saberUserInfo.role_name.indexOf('admin') != -1 || this.saberUserInfo.role_name.indexOf('总部') != -1) {
-                this.option.searchMenuSpan = 12
+                this.option.searchMenuSpan = 6
                 this.option.column.forEach(item => {
                     if (item.prop == 'branchId') {
                         item.search = true

src/views/iosBasicData/financialManagement/reimbursement/detailsPage.vue

@@ -7,6 +7,11 @@
         </el-button>
       </div>
       <div class="add-customer-btn">
+        <el-button size="small" style="margin-right: 8px" :disabled="!form.id" @click="$refs.print.openDialog()">预 览
+        </el-button>
+        <el-button v-if="roleName.indexOf('admin') != -1" size="small" style="margin-right: 8px" :disabled="!form.id"
+          @click="$refs.report.openDialog()">报表设计
+        </el-button>
         <el-button class="el-button--small-yh" style="margin-left: 6px;" type="primary" size="small" v-if="editButton"
           :disabled="showLock || !(roleName.indexOf('admin') != -1 || roleName.indexOf('允许修改他人业务') != -1 || saberUserInfo.user_id == form.createUser)"
           @click="inEdit">编 辑
@@ -95,14 +100,13 @@
         <el-tab-pane label="文件中心">
           <containerTitle title="上传附件"></containerTitle>
           <c-upload :data="form.filesCenterList" :enumerationValue="76"
-            deleteUrl="/api/blade-los/tradingBoxFiles/remove" display :disabled="editButton"></c-upload>
+            deleteUrl="/api/blade-los/tradingBoxFiles/remove" display :pId="form.id"
+            :saveBtn="true" @upDate="upDate"></c-upload>
         </el-tab-pane>
       </el-tabs>
     </div>
-    <business-reports :id="form.id" :itemIds="itemIds" ref="print" businessValue="MYDL" :type="true"></business-reports>
-    <business-reports :id="form.id" :itemIds="itemCIds" ref="printC" businessValue="MYDL" classifyCode="费用"
-      groupCode="应付" :selecList="selectionfeecList"></business-reports>
-    <reports :id="form.id" :assemblyForm="form" businessValue="MYDL" ref="report"></reports>
+    <business-reports :id="form.id" :itemIds="itemIds" ref="print" businessValue="YYFY" :type="true"></business-reports>
+    <reports :id="form.id" :assemblyForm="form" businessValue="YYFY" ref="report"></reports>
     <!--审核弹窗-->
     <el-dialog append-to-body title="审批进度" class="el-dialogDeep" :visible.sync="checkScheduleDialog" width="40%"
       :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
@@ -138,8 +142,8 @@ import {
 } from "@/api/iosBasicData/reimbursement.js";
 import dicSelect from "@/components/dicSelect/main";
 import checkSchedule from "@/components/checkH/checkSchedule.vue";
-import businessReports from "@/components/tradeAgency/businessReports.vue";
-import reports from "@/components/tradeAgency/reports.vue";
+import businessReports from "@/components/boxManagement/businessReports.vue";
+import reports from "@/components/boxManagement/reports.vue";
 import feeModify from "@/components/feeModify/boxMain.vue";
 import feeModifyView from "@/components/feeModify/view.vue";
 import { dateFormat } from "@/util/date";
@@ -305,7 +309,6 @@ export default {
             label: '制单人',
             prop: "createUserName",
             disabled: true,
-            span: 4,
           },
           {
             label: '制单日期',
@@ -316,13 +319,11 @@ export default {
             label: '修改人',
             prop: "updateUserName",
             disabled: true,
-            span: 4,
           },
           {
             label: '修改日期',
             prop: "updateTime",
             disabled: true,
-            span: 4,
           }
         ]
       },
@@ -466,6 +467,9 @@ export default {
     }
   },
   methods: {
+    upDate(list) {
+      this.form.filesCenterList = list
+    },
     initData() {
       getUserInfo().then(res => {
         this.$set(this.form, 'applicantId', res.data.data.id);
@@ -562,8 +566,8 @@ export default {
         background: 'rgba(255,255,255,0.7)'
       });
       detail({ id: id }).then(res => {
-        if (res.data.data.status != 0){
-          this.editButton=true
+        if (res.data.data.status != 0) {
+          this.editButton = true
           this.editDisabled = true
           this.optionForm.disabled = true
         }

src/views/ow/owPut/detailsPage.vue

@@ -243,6 +243,8 @@
               <el-button type="danger" plain size="small" :disabled="selecPickList.length == 0"
                 @click="allClick('撤销生成')">撤销生成费用</el-button>
               <el-button type="warning" plain size="small" @click="allClick('批量导入费用')">批量导入费用</el-button>
+              <el-button type="danger" plain size="small" :disabled="selecPickList.length == 0"
+                @click="allClick('撤销导入')">撤销导入</el-button>
             </template>
           </avue-crud>
         </el-tab-pane>
@@ -282,9 +284,13 @@
                 <el-button type="info" plain size="small" @click="allClick('D费用一键编辑')">一键编辑</el-button>
                 <el-button type="danger" plain size="small" :disabled="selectionfeedList.length == 0"
                   @click="allClick('D费用批量删除')">批量删除</el-button>
+                <el-button type="primary" plain size="small" :disabled="selectionfeedList.length == 0"
+                  @click="allClick('D发票申请')">发票申请</el-button>
                 <el-button type="primary" plain size="small"
                   :disabled="(selectionfeedList.length == 0 && selectionfeecList.length == 0)"
                   @click="allClick('D费用申请')">请核费用</el-button>
+                <el-button type="danger" plain size="small" :disabled="disabled || selectionfeecList.length == 0"
+                  @click="allClick('D撤销请核')">撤销请核</el-button>
                 <!-- <el-button type="primary" plain size="small" :disabled="editDisabled">计算超期箱使费</el-button> -->
                 <!-- <el-button type="primary" plain size="small" @click="$refs.printC.openDialog()">打印账单</el-button> -->
               </template>
@@ -375,6 +381,12 @@
                 <el-button type="info" plain size="small" @click="allClick('C费用一键编辑')">一键编辑</el-button>
                 <el-button type="danger" plain size="small" :disabled="selectionfeecList.length == 0"
                   @click="allClick('C费用批量删除')">批量删除</el-button>
+                <el-button type="primary" plain size="small" :disabled="selectionfeecList.length == 0"
+                  @click="allClick('C付费申请')">付费申请</el-button>
+                <el-button type="primary" plain size="small" :disabled="selectionfeedList.length"
+                  @click="allClick('C费用申请')">请核费用</el-button>
+                <el-button type="danger" plain size="small" :disabled="disabled || selectionfeecList.length == 0"
+                  @click="allClick('C撤销请核')">撤销请核</el-button>
                 <!-- <el-button type="primary" plain size="small" :disabled="editDisabled || selectionfeecList.length == 0"
                   @click="allClick('C费用申请')">请核费用</el-button> -->
                 <!-- <el-button type="primary" plain size="small" @click="$refs.printC.openDialog()">打印账单</el-button> -->
@@ -594,9 +606,10 @@
         </template>
         <template slot="menu" slot-scope="{ row, index }">
           <el-button size="small" icon="el-icon-edit" type="text" @click="rowEdit(row, index)"
-            :disabled="editDisabled || feeCenterListD.filter(item => item.feeCnName == '租箱费').length > 0">{{ row.$cellEdit
-              ? '保存' :
-              '编辑'
+            :disabled="editDisabled || feeCenterListD.filter(item => item.feeCnName == '租箱费').length > 0">{{
+              row.$cellEdit
+                ? '保存' :
+                '编辑'
             }}</el-button>
           <el-button size="small" icon="el-icon-delete" type="text" @click="rowDel(row, index)"
             :disabled="editDisabled || feeCenterListD.filter(item => item.feeCnName == '租箱费').length > 0">删除</el-button>
@@ -650,7 +663,9 @@ import {
   feeList,
   bfeesList,
   mergeGenerateCost,
-  revokeMergeGenerateCost
+  revokeMergeGenerateCost,
+  revokePickUpCost,
+  revokeCheckPleaseVerifyCost
 } from "@/api/boxManagement/buyContainer";
 import dicSelect from "@/components/dicSelect/main";
 import containerNumber from "@/components/dicSelect/containerNumber";
@@ -3101,7 +3116,7 @@ export default {
         }
         this.activationDialog = true
       }
-        if (name == '撤销启用') {
+      if (name == '撤销启用') {
         this.$confirm("确认撤销启用?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
@@ -3426,6 +3441,53 @@ export default {
           })
         });
       }
+      if (name == 'D发票申请') {
+        if (this.selectionfeedList.length == 0) return this.$message.error("请选择费用");
+        if (this.selectionfeedList.length != this.selectionfeedList.filter(e => e.corpCnName == this.selectionfeedList[0].corpCnName).length) return this.$message.error("请选择相同的结算单位");
+        if (this.selectionfeedList.filter(e => e.auditStatus != 4).length) return this.$message.error("请选择审核通过的费用");
+        if (this.$store.getters.finappStatus) {
+          this.$alert("发票申请页面已存在,请关闭发票申请再进行操作", "温馨提示", {
+            confirmButtonText: "确定",
+            type: 'warning',
+            callback: action => {
+            }
+          });
+        } else {
+          this.$router.push({
+            path: `/iosBasicData/financialManagement/fininvoicesApplyfor/index`,
+            query: {
+              // mblno: this.form.mblno,
+              corpCnName: this.selectionfeedList[0].corpCnName,
+              corpEnName: this.selectionfeedList[0].corpEnName,
+              corpId: this.selectionfeedList[0].corpId
+            }
+          })
+        }
+
+      }
+      if (name == 'C付费申请') {
+        if (this.selectionfeecList.length == 0) return this.$message.error("请选择费用");
+        if (this.selectionfeecList.filter(e => e.auditStatus != 4).length) return this.$message.error("请选择审核通过的费用");
+        if (this.selectionfeecList.length != this.selectionfeecList.filter(e => e.corpCnName == this.selectionfeecList[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/financialManagement/PaymentApplication/index`,
+            query: {
+              // mblno: this.form.mblno,
+              corpCnName: this.selectionfeecList[0].corpCnName,
+              corpEnName: this.selectionfeecList[0].corpEnName,
+              corpId: this.selectionfeecList[0].corpId
+            }
+          })
+        }
+      }
       if (name == 'C费用申请') {
         for (let row of this.selectionfeecList) {
           if (!row.id) {
@@ -3466,6 +3528,87 @@ export default {
           })
         });
       }
+      if (name == 'D撤销请核') {
+        for (let row of this.selectionfeedList) {
+          if (!row.id) {
+            return this.$message.error("请保存费用明细");
+          }
+          if (row.auditStatus == 0) {
+            return this.$message.error("未申请费用，不允许撤销");
+          }
+          if (row.auditStatus > 2) {
+            return this.$message.error("费用已经审核通过,请使用申请修改和删除功能!");
+          }
+        }
+        this.$confirm("确定撤销请核?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          let obj = {}
+          obj = {
+            srcId: this.form.id,
+            srcType: this.form.type,
+            feeCenterList: this.selectionfeedList,
+            url: '/ow/owPut/index',
+            pageStatus: '',
+            pageLabel: 'OW(放)',
+          }
+          const loading = this.$loading({
+            lock: true,
+            text: '加载中',
+            spinner: 'el-icon-loading',
+            background: 'rgba(255,255,255,0.7)'
+          });
+          revokeCheckPleaseVerifyCost(obj).then(res => {
+            this.$message.success("操作成功");
+            this.getDetail(this.form.id)
+          }).finally(() => {
+            loading.close();
+          })
+        });
+      }
+
+      if (name == 'C撤销请核') {
+        for (let row of this.selectionfeecList) {
+          if (!row.id) {
+            return this.$message.error("请保存费用明细");
+          }
+          if (row.auditStatus == 0) {
+            return this.$message.error("未申请费用，不允许撤销");
+          }
+          if (row.auditStatus > 2) {
+            return this.$message.error("费用已经审核通过,请使用申请修改和删除功能!");
+          }
+        }
+        this.$confirm("确定撤销请核?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          let obj = {}
+          obj = {
+            srcId: this.form.id,
+            srcType: this.form.type,
+            feeCenterList: this.selectionfeecList,
+            url: '/ow/owPut/index',
+            pageStatus: '',
+            pageLabel: 'OW(放)',
+          }
+          const loading = this.$loading({
+            lock: true,
+            text: '加载中',
+            spinner: 'el-icon-loading',
+            background: 'rgba(255,255,255,0.7)'
+          });
+          revokeCheckPleaseVerifyCost(obj).then(res => {
+            this.$message.success("操作成功");
+            this.getDetail(this.form.id)
+          }).finally(() => {
+            loading.close();
+          })
+        });
+      }
       if (name == '批量导入费用') {
         this.checkRate(null, this.form.effectiveDate, null, 1, this.deptId)
         this.$DialogForm.show({
@@ -3616,6 +3759,25 @@ export default {
           this.getPick()
         })
       }
+      if (name == '撤销导入') {
+        let ids = []
+        for (let item of this.selecPickList) {
+          if (item.whetherGenerateCost == 0) {
+            return this.$message.error("请选择要撤销的明细");
+          }
+          ids.push(item.id)
+        }
+
+        let obj = {
+          id: this.form.id,
+          itemIds: ids.join(',')
+        }
+        revokePickUpCost(obj).then(res => {
+          this.$message.success("操作成功");
+          this.getDetail(this.form.id)
+          this.getPick()
+        })
+      }
       if (name == '合并生成2') {
         for (let item of this.selecPickList) {
           if (item.whetherGenerateCost == 1) {

src/views/ow/owPut/index.vue

@@ -142,6 +142,15 @@ export default {
             index: 3,
           },
           {
+            label: '有效日期起',
+            prop: 'effectiveDate',
+            type: "date",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd HH:mm:ss",
+            width: 100,
+            overHidden: true,
+          },
+          {
             label: '内部放箱号',
             prop: 'internalContainerNumber',
             width: 100,
@@ -287,7 +296,7 @@ export default {
             width: 100,
             overHidden: true,
             hide: true,
-            showColumn: false,
+            // showColumn: false,
             search: true,
             searchOrder: 9,
             type: 'select',
@@ -314,15 +323,6 @@ export default {
           //   },
           // },
           {
-            label: '有效日期起',
-            prop: 'effectiveDate',
-            type: "date",
-            format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd HH:mm:ss",
-            width: 100,
-            overHidden: true,
-          },
-          {
             label: '有效日期止',
             prop: 'expiryDate',
             type: "date",
@@ -333,10 +333,10 @@ export default {
           },
           {
             label: '有效日期',
-            prop: 'effectiveDate',
+            prop: 'effectiveDateList',
             width: 120,
             hide: true,
-            showColumn: false,
+            // showColumn: false,
             search: true,
             searchOrder: 11,
             searchProp: 'effectiveDateList',

src/views/ow/owTask/detailsPage.vue

@@ -52,7 +52,7 @@
                     res="records" @selectChange="dicChange('purchaseCompanyName', $event)"
                     :disabled="editDisabled || (fixData && form.whetherEnable == '是')"
                     url="/blade-los/bcorps/selectList?status=0&current=1&size=5&corpTypeName=箱东" :filterable="true"
-                    :remote="true" dataName="shortName" :slotRight="true" rightLabel="code">
+                    :remote="true" dataName="shortName" :slotRight="true" rightLabel="code" style="width: 100%;">
                   </dic-select>
                   <el-tooltip class="item" effect="dark" content="导入OW合约" placement="top">
                     <el-button v-show="form.purchaseCompanyName" icon="el-icon-search" @click.stop="inOwhy" />
@@ -2571,6 +2571,9 @@ export default {
       delete this.owRow.updateTime
       delete this.owRow.type
       delete this.owRow.containerNumber
+      delete this.owRow.whetherEnable
+      delete this.owRow.status
+      delete this.owRow.sysNo
       this.form = {
         ...this.owRow,
         rentTermList: [

src/views/ow/owTask/index.vue

@@ -158,6 +158,16 @@ export default {
             search: true,
             searchOrder: 2,
           },
+          
+          {
+            label: '有效日期起',
+            prop: 'effectiveDate',
+            type: "date",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd HH:mm:ss",
+            width: 100,
+            overHidden: true,
+          },
           {
             label: '内部放箱号',
             prop: 'internalContainerNumber',
@@ -328,7 +338,7 @@ export default {
             width: 100,
             overHidden: true,
             hide: true,
-            showColumn: false,
+            // showColumn: false,
             search: true,
             searchOrder: 9,
             type: 'select',
@@ -358,15 +368,6 @@ export default {
           //   index:13,
           // },
           {
-            label: '有效日期起',
-            prop: 'effectiveDate',
-            type: "date",
-            format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd HH:mm:ss",
-            width: 100,
-            overHidden: true,
-          },
-          {
             label: '有效日期止',
             prop: 'expiryDate',
             type: "date",
@@ -377,10 +378,10 @@ export default {
           },
           {
             label: '有效日期',
-            prop: 'effectiveDate',
+            prop: 'effectiveDateList',
             width: 120,
             hide: true,
-            showColumn: false,
+            // showColumn: false,
             search: true,
             searchOrder: 11,
             searchProp: 'effectiveDateList',