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

src/components/checkH/checkSchedule.vue

@@ -1,31 +1,25 @@
 <template>
   <div>
-    <div style="height: 90%;margin-top:30px;margin-left: 20%" v-if="data.length>0">
-      <el-steps direction="vertical"
-                :active="active"
-                space="150px"
-                align-center
-                style="font-size: 12px">
-        <el-step :key="index"
-                 v-for="(item,index) in data"
-                 :title="item.title"
-                 :status="item.status"
-                 style="font-size: 14px !important;">
+    <div style="height: 90%;margin-top:30px;margin-left: 20%" v-if="data.length > 0">
+      <el-steps direction="vertical" :active="active" space="150px" align-center style="font-size: 12px">
+        <el-step :key="index" v-for="(item, index) in data" :title="item.title" :status="item.status"
+          style="font-size: 14px !important;">
           <template slot="description" scope="scope">
             <table width="100%" border="0" cellspacing="0" cellpadding="0" style="font-size: 14px">
               <tr>
                 <td>
-                  <span >{{index === 0?'提交人:':'审批人:'}}&nbsp;&nbsp;&nbsp;</span><span>{{item.auditName}}</span>
+                  <span>{{ index === 0 ? '提交人:' : '审批人:' }}&nbsp;&nbsp;&nbsp;</span><span>{{ item.auditName }}</span>
                 </td>
               </tr>
               <tr>
                 <td>
-                  <span >{{index === 0?'提交日期:':'审批日期:'}}&nbsp;&nbsp;&nbsp;</span><span>{{item.auditOpTime}}</span>
+                  <span>{{ index === 0 ? '提交日期:' : '审批日期:' }}&nbsp;&nbsp;&nbsp;</span><span>{{ item.auditOpTime
+                  }}</span>
                 </td>
               </tr>
               <tr>
                 <td>
-                  <span >{{index === 0?'备注':'审批意见'}}:&nbsp;&nbsp;&nbsp;</span><span>{{item.auditMsg}}</span>
+                  <span>{{ index === 0 ? '备注' : '审批意见' }}:&nbsp;&nbsp;&nbsp;</span><span>{{ item.auditMsg }}</span>
                 </td>
               </tr>
             </table>
@@ -33,6 +27,7 @@
         </el-step>
       </el-steps>
       <div class="dialogButton">
+        <el-button v-if="printShow" type="success" size="small" @click="printWindowfun">审核报表</el-button>
         <el-button size="small" @click="$emit('choceScheduleFun')">关闭</el-button>
       </div>
     </div>
@@ -45,97 +40,231 @@
         <el-button size="small" @click="$emit('choceScheduleFun')">关闭</el-button>
       </div>
     </div>
+    <reportContainerlos style="width: 100%; height: 100vh" ref="reportContainer" :butShow="false">
+    </reportContainerlos>
   </div>
 </template>
 
 <script>
-  import option from './config/mainList.json'
-  import { auditProcessListHD } from "@/api/check/check";
-
-  export default {
-    name: "checkSchedule",
-    props: {
-      checkId: {
-        type: String
-      },
-      batchNo:{
-        type: String
-      },
-      times:{
-        type: String
+import option from './config/mainList.json'
+import { auditProcessListHD } from "@/api/check/check";
+import { getList as getreportsList } from "@/api/iosBasicData/reports";
+import { reportsGetReportData } from "@/api/iosBasicData/reports";
+import reportContainerlos from "@/views/iosBasicData/report-container/report-container-los.vue"
+export default {
+  components: {
+    reportContainerlos
+  },
+  name: "checkSchedule",
+  props: {
+    checkId: {
+      type: String
+    },
+    batchNo: {
+      type: String
+    },
+    times: {
+      type: String
+    },
+    choceScheduleFun: {
+      type: Function
+    },
+    businessType: {
+      type: String
+    },
+    classifyCode: {
+      type: String
+    },
+    groupCode: {
+      type: String
+    },
+    printShow: {
+      type: Boolean,
+      default: false
+    },
+  },
+  data() {
+    return {
+      checkData: {},
+      loading: false,
+      option: option,
+      active: 1,
+      data: [],
+      page: {
+        pageSize: 10,
+        pagerCount: 5,
+        total: 0,
       },
-      choceScheduleFun:{
-        type: Function
+      reportsData: {}
+    }
+  },
+  watch: {
+    checkId(val, oldVal) {
+      if (val != oldVal) {
+        this.init()
       }
     },
-    data(){
-      return {
-        loading:false,
-        option:option,
-        active:1,
-        data:[],
-        page: {
-          pageSize: 10,
-          pagerCount: 5,
-          total: 0,
-        },
+    batchNo(val, oldVal) {
+      if (val != oldVal) {
+        this.init()
       }
-    },
-    watch:{
-      checkId(val, oldVal) {
-        if(val != oldVal){
-          this.init()
-        }
-      },
-      batchNo(val, oldVal) {
-        if(val != oldVal){
-          this.init()
+    }
+  },
+  created() {
+
+  },
+  mounted() {
+    this.init()
+  },
+  methods: {
+    init() {
+      this.times = this.times ? this.times : ''
+      auditProcessListHD(this.checkId, this.batchNo, this.times).then(res => {
+        res.data.data.map((item, index) => {
+          if (item.auditStatus == "A") {
+            this.active = index + 2
+            item.title = "审批通过"
+            item.status = "success"
+          }
+          if (item.auditStatus == "B") {
+            item.title = "审批驳回"
+            item.status = "error"
+          }
+          if (item.auditStatus == "S" || item.auditStatus == "N") {
+            item.title = "待审批"
+          }
+        })
+
+        let sendObject = {
+          ...res.data.data[0],
+          auditName: res.data.data[0].sendName,
+          auditOpTime: res.data.data[0].sendTime,
+          auditMsg: res.data.data[0].sendMsg,
+          auditStatus: "O",
+          title: "提交",
         }
+        res.data.data.unshift(sendObject)
+        this.data = res.data.data
+      })
+    },
+    printWindowfun() {
+      // 当时选择的数据
+      let obj = {}
+      obj = {
+        businessType: this.businessType,
+        classifyCode: this.classifyCode,
+        groupCode: this.groupCode
       }
+      getreportsList(1, 10, obj).then(res => {
+        this.reportRadio(res.data.data.records[0])
+      })
     },
-    created() {
-
+    // 获取报表数据
+    reportRadio(val) {
+      reportsGetReportData({
+        billId: this.checkId,
+        reportCode: val.classifyCode,
+        groupCode: val.groupCode,
+        type: val.businessType
+      }).then(res => {
+        this.handleReportPreview(val.url, res.data.data.data)
+      })
     },
-    mounted() {
-      this.init()
+    handleReportPreview(url, data) {
+      this.reportlist = data // 存一下数据 打印的时候需要传
+
+      Stimulsoft.Base.StiLicense.key = '6vJhGtLLLz2GNviWmUTrhSqnOItdDwjBylQzQcAOiHn0s4gy0Fr5YoUZ9V00Y0igCSFQzwEqYBh/N77k4f0fWXTHW5rqeBNLkaurJDenJ9o97TyqHs9HfvINK18Uwzsc/bG01Rq+x3H3Rf+g7AY92gvWmp7VA2Uxa30Q97f61siWz2dE5kdBVcCnSFzC6awE74JzDcJMj8OuxplqB1CYcpoPcOjKy1PiATlC3UsBaLEXsok1xxtRMQ283r282tkh8XQitsxtTczAJBxijuJNfziYhci2jResWXK51ygOOEbVAxmpflujkJ8oEVHkOA/CjX6bGx05pNZ6oSIu9H8deF94MyqIwcdeirCe60GbIQByQtLimfxbIZnO35X3fs/94av0ODfELqrQEpLrpU6FNeHttvlMc5UVrT4K+8lPbqR8Hq0PFWmFrbVIYSi7tAVFMMe2D1C59NWyLu3AkrD3No7YhLVh7LV0Tttr/8FrcZ8xirBPcMZCIGrRIesrHxOsZH2V8t/t0GXCnLLAWX+TNvdNXkB8cF2y9ZXf1enI064yE5dwMs2fQ0yOUG/xornE'
+      // Stimulsoft.Base.StiLicense.Key = '6vJhGtLLLz2GNviWmUTrhSqnOItdDwjBylQzQcAOiHkcgIvwL0jnpsDqRpWg5FI5kt2G7A0tYIcUygBh1sPs7plofUOqPB1a4HBIXJB621mau2oiAIj+ysU7gKUXfjn/D5BocmduNB+ZMiDGPxFrAp3PoD0nYNkkWh8r7gBZ1v/JZSXGE3bQDrCQCNSy6mgby+iFAMV8/PuZ1z77U+Xz3fkpbm6MYQXYp3cQooLGLUti7k1TFWrnawT0iEEDJ2iRcU9wLqn2g9UiWesEZtKwI/UmEI2T7nv5NbgV+CHguu6QU4WWzFpIgW+3LUnKCT/vCDY+ymzgycw9A9+HFSzARiPzgOaAuQYrFDpzhXV+ZeX31AxWlnzjDWqpfluygSNPtGul5gyNt2CEoJD1Yom0VN9fvRonYsMsimkFFx2AwyVpPcs+JfVBtpPbTcZscnzUdmiIvxv8Gcin6sNSibM6in/uUKFt3bVgW/XeMYa7MLGF53kvBSwi78poUDigA2n12SmghLR0AHxyEDIgZGOTbNI33GWu7ZsPBeUdGu55R8w='
+      Stimulsoft.Base.Localization.StiLocalization.addLocalizationFile('/reports/stimulsoft/Localization/zh-CHS.xml', true, 'zh-CHS')
+      Stimulsoft.Base.Localization.StiLocalization.setLocalizationFile('/reports/stimulsoft/Localization/zh-CHS.xml')
+
+      // 工具栏
+      var options = new Stimulsoft.Viewer.StiViewerOptions()
+      options.height = '100%'
+      options.appearance.scrollbarsMode = true
+      options.toolbar.showDesignButton = false
+      options.toolbar.showAboutButton = false
+      options.toolbar.showResourcesButton = false
+      options.toolbar.showFullScreenButton = false
+      options.toolbar.showOpenButton = false
+      options.appearance.showTooltips = false
+      options.appearance.showDialogsHelp = false
+      options.exports.showExportToDocument = false
+      options.toolbar.showParametersButton = true
+      options.appearance.bookmarksPrint = true
+      options.toolbar.printDestination = Stimulsoft.Viewer.StiPrintDestination.Direct
+      options.appearance.htmlRenderMode = Stimulsoft.Report.Export.StiHtmlExportMode.Table
+      let viewer = new Stimulsoft.Viewer.StiViewer(options, 'StiViewer', false)
+
+      // 报表
+      console.log("创建一个报表实例");
+      let report = new window.Stimulsoft.Report.StiReport();
+
+      // 加载文件
+      console.log("从url加载报表");
+      // report.loadFile("/reports/stimulsoft/demos/SimpleList.mrt");
+      // report.load(row.url)
+      report.load(url)
+
+      // 加载数据
+      var dataSet = new Stimulsoft.System.Data.DataSet(
+        'reportData'
+      )
+      dataSet.readJson(data)
+      report.regData('reportData', 'reportData', dataSet)
+      // 从模版和数据加载报表
+      // loadReport(report, '', {})
+
+      viewer.report = report;
+
+
+      this.$refs.reportContainer.showContainer(
+        () => {
+          setTimeout(() => {
+            viewer.renderHtml('reportContainer')
+            this.createViewerButtons(viewer)
+          }, 50)
+        },
+        () => {
+        },
+      )
+      console.log(report, 301)
+      // var printButton = report.renderedPages[0].components.find(function(c) {
+      //     return c.name === 'printButton';
+      // });
+      // // 为按钮控件添加“PrintReport”事件
+      // printButton.events.add('PrintReport', handlePrintReport);
+      console.log("加载成功完成!");
     },
-    methods:{
-      init(){
-        this.times = this.times?this.times:''
-        auditProcessListHD(this.checkId,this.batchNo,this.times).then(res =>{
-          res.data.data.map((item,index) =>{
-            if(item.auditStatus == "A"){
-              this.active = index + 2
-              item.title = "审批通过"
-              item.status = "success"
-            }
-            if(item.auditStatus == "B"){
-              item.title = "审批驳回"
-              item.status = "error"
-            }
-            if(item.auditStatus == "S" || item.auditStatus == "N"){
-              item.title = "待审批"
-            }
-          })
+    // 报表的按钮
+    createViewerButtons(viewer) {
+      viewer.jsObject.collections.images['myClose.png'] =
+        'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAA0ElEQVQ4ja3TO05CQRQG4A8iOwAbtYWETndAaecK7NwCKmETtJZsSBNLobEz8ZFIJQ0UnOGSm3DnYviTybzO/895DQXGWGCVGQuMEqkRcwcfuMOLalziCaf4TIe9UG9nyMJmFRzNGoRK1BU4xxx9G7cfwostciGk+x8MqgySwDXe4tU53hVV+MNtTmAoX84JGv9NYgrHyR6DV8wUSW7hItZLm36ZVoVQxsFJLOMsPOrH/h7dQwR2cdxOTEn8DtUbPGc4V2H7Vb4Yqfedf/GYSGt8VUmxgyfuBAAAAABJRU5ErkJggg=='
+      const closeBtn = viewer.jsObject.SmallButton(
+        'closeBtn',
+        '关闭',
+        'myClose.png'
+      )
 
-          let sendObject = {
-            ... res.data.data[0],
-            auditName:res.data.data[0].sendName,
-            auditOpTime:res.data.data[0].sendTime,
-            auditMsg:res.data.data[0].sendMsg,
-            auditStatus:"O",
-            title:"提交",
-          }
-          res.data.data.unshift(sendObject)
-          this.data = res.data.data
-        })
+      const toolbarTable = viewer.jsObject.controls.toolbar.firstChild.firstChild
+      const buttonsTable = toolbarTable.rows[0].lastChild.lastChild
+      const userButtonCell = buttonsTable.rows[0].insertCell(0)
+      userButtonCell.className = 'stiJsViewerClearAllStyles'
+      userButtonCell.appendChild(closeBtn)
+
+      let that = this
+      closeBtn.action = function () {
+        console.log(that.$refs.ReportContainer)
+        if (that.$refs.reportContainer)
+          that.$refs.reportContainer.hideContainer()
       }
-    }
+    },
   }
+}
 </script>
 
 <style scoped lang="scss">
-  /*::v-deep .el-step__title{*/
-  /*  font-size: 14px;*/
-  /*}*/
+/*::v-deep .el-step__title{*/
+/*  font-size: 14px;*/
+/*}*/
 </style>

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

@@ -4,7 +4,6 @@
             <el-row :gutter="20">
                 <el-col :span="8">
                     <el-row>
-                        {{ detailData}}
                         <el-form-item label="发货人" prop="hshipperCnName">
                             <span slot="label">
                                 <span style="color: #1e9fff">发货人</span>

src/views/iosBasicData/ComputationCenter/settlementDetails.vue

@@ -239,10 +239,10 @@
                                 @click="invoiceMatchingfun()">匹配金额</el-button>
                             <span style="font-size: 18px;font-weight: 600;margin-left: 50px;">
                                 <span style="color: #67C23A;margin-right: 10px;">
-                                    CNY:￥{{ amountSubSum }}元
+                                    CNY:￥{{ Number(amountSubSum).toFixed(2) }}元
                                 </span>
                                 <span style="color: #E6A23C;">
-                                    USD:${{ amountSubUsdSum }}元
+                                    USD:${{ Number(amountSubUsdSum).toFixed(2) }}元
                                 </span>
                             </span>
                         </div>

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

@@ -31,7 +31,8 @@
                 </el-button>
                 <el-button type="success" size="small" @click="CopyDocumentsfun">复制单据
                 </el-button>
-                <el-button v-if="bigtabs == 'fy'" size="small" :loading="saveLoading" @click="previewDialogfun" :disabled="!form.id">预 览
+                <el-button v-if="bigtabs == 'fy'" size="small" :loading="saveLoading" @click="previewDialogfun"
+                    :disabled="!form.id">预 览
                 </el-button>
                 <el-button size="small" type="warning" :disabled="!form.id || detailData.seeDisabled || showLock"
                     v-if="form.status == 1" @click.stop="revokeDocumentApproval">撤销单据请核
@@ -66,6 +67,7 @@
             <el-tabs type="border-card" v-model="bigtabs" @tab-click="bigHandleClick">
                 <el-tab-pane label="委托信息" name="wt" class="scrollable-container">
                     <div>
+
                         <el-form :model="form" ref="form" label-width="90px" class="demo-ruleForm">
                             <containerTitle title="基础资料"></containerTitle>
                             <basic-container :showBtn="true">
@@ -130,23 +132,23 @@
                                                                             .text ||
                                                                             ''}`
                                                                             " :forParameter="item[0]
-                                                                                    .forParameter
-                                                                                    " @remoteMethod="
+                                                                                .forParameter
+                                                                                " @remoteMethod="
                                                                                     remoteMethod(
                                                                                         $event,
                                                                                         item[0].prop
                                                                                     )
                                                                                     " @corpChange="
-                                                                                    corpChange(
-                                                                                        $event,
-                                                                                        item[0].prop
-                                                                                    )
-                                                                                    " @corpFocus="
-                                                                                    remoteMethod(
-                                                                                        $event,
-                                                                                        item[0].prop
-                                                                                    )
-                                                                                    ">
+                                                                                        corpChange(
+                                                                                            $event,
+                                                                                            item[0].prop
+                                                                                        )
+                                                                                        " @corpFocus="
+                                                                                                remoteMethod(
+                                                                                                    $event,
+                                                                                                    item[0].prop
+                                                                                                )
+                                                                                                ">
                                                         </search-query>
                                                         <el-input v-else type="age" style="width: 100%;" v-model="form[
                                                             item[0].prop
@@ -222,13 +224,9 @@
                                                         </search-query>
 
                                                         <tree-select v-else-if="
-                                                            item[1].type ==
-                                                            'tree'
-                                                        " v-model="form[
-                                                            item[1].prop
-                                                        ]
-                                                            " filterable :data="item[1].dicData
-                                                                " :props="item[1]
+                                                            item[1].type == 'tree'" v-model="form[item[1].prop]
+                                                                " filterable :data="item[1].dicData
+                                                                    " :props="item[1]
                                                                     .forParameter
                                                                     " nodeKey="title" size="small" :disabled="detailData.seeDisabled ||
                                                                         item[1]
@@ -238,7 +236,7 @@
                                                             :placeholder="`${item[1]
                                                                 .text ||
                                                                 ''}`
-                                                                " @input="
+                                                                " @selectChange="
                                                                     corpChange(
                                                                         $event,
                                                                         item[1].prop
@@ -354,10 +352,10 @@
                                                                                 item.prop
                                                                             )
                                                                             " @eldialogConfirm="
-                                                                            eldialogConfirm(
-                                                                                item.slot
-                                                                            )
-                                                                            ">
+                                                                                eldialogConfirm(
+                                                                                    item.slot
+                                                                                )
+                                                                                ">
                                                     <bcorps v-show="item.slot ==
                                                         'bcorps'
                                                         " ref="bcorps" :eldialog="true" @selectionChange="
@@ -462,7 +460,8 @@
         <!--审核弹窗-->
         <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>
-            <check-schedule :checkId="checkId" :batchNo="batchNo" @choceScheduleFun="choceScheduleFun"></check-schedule>
+            <check-schedule :checkId="checkId" :batchNo="batchNo" @choceScheduleFun="choceScheduleFun" :printShow="true"
+                businessType="HYJK" classifyCode='业务' groupCode='销售报告'></check-schedule>
         </el-dialog>
 
         <!--预览报表弹窗-->
@@ -1439,12 +1438,8 @@ export default {
                 }
             } else if (name == "accDeptName") {
                 // OP 下拉赋值 用户管理列表
-                for (let item of this.columnforfun("accDeptName").dicData) {
-                    if (item.title == value) {
-                        this.form.accDeptName = item.title;
-                        this.form.accDept = item.id;
-                    }
-                }
+                this.form.accDept = value.id
+                this.form.accDeptName = value.title
             } else if (name == "corpCnName") {
                 if (value) {
                     // this.columnforfun('corpAttnName').disabled = false
@@ -1813,6 +1808,13 @@ export default {
         editCustomer(status) {
             this.$refs.form.validate(valid => {
                 if (valid) {
+                    for (let item of this.columnforfun('accDeptName').dicData) {
+                        if (this.form.accDeptName == item.title) {
+                            if (item.hasChildren) {
+                                return this.$message.error('请选择末级部门')
+                            }
+                        }
+                    }
                     // 判断必填项
                     let msgs = [];
                     if (!this.form.quantity) {
@@ -2208,7 +2210,7 @@ export default {
             // 如果已经请核就禁用按钮
             if (this.form.status == 1 || this.form.status == 2 || this.form.status == 3) {
                 this.detailData.seeDisabled = true
-            }else {
+            } else {
                 this.detailData.seeDisabled = false
             }
             if (

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

@@ -158,7 +158,7 @@
                                                             :clearable="false"
                                                             :disabled="detailData.seeDisabled || item[1].disabled"
                                                             :multiple="false" :placeholder="`${item[1].text || ''}`"
-                                                            @input="corpChange($event, item[1].prop)">
+                                                            @selectChange="corpChange($event, item[1].prop)">
                                                         </tree-select>
 
                                                         <el-input v-else type="age" style="width: 100%;"
@@ -295,7 +295,8 @@
         <!--审核弹窗-->
         <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>
-            <check-schedule :checkId="checkId" :batchNo="batchNo" @choceScheduleFun="choceScheduleFun"></check-schedule>
+            <check-schedule :checkId="checkId" :batchNo="batchNo" @choceScheduleFun="choceScheduleFun" :printShow="true"
+                businessType="HYCK" classifyCode='业务' groupCode='销售报告'></check-schedule>
         </el-dialog>
 
         <!--预览报表弹窗-->
@@ -1613,13 +1614,8 @@ export default {
                 }
             }
             else if (name == 'accDeptName') {
-                // OP 下拉赋值 用户管理列表
-                for (let item of this.columnforfun('accDeptName').dicData) {
-                    if (item.title == value) {
-                        this.form.accDeptName = item.title
-                        this.form.accDept = item.id
-                    }
-                }
+                this.form.accDept = value.id
+                this.form.accDeptName = value.title
             }
             else if (name == 'corpCnName') {
                 if (value) {
@@ -2041,6 +2037,13 @@ export default {
         editCustomer(status) {
             this.$refs.form.validate((valid) => {
                 if (valid) {
+                    for (let item of this.columnforfun('accDeptName').dicData) {
+                        if (this.form.accDeptName == item.title) {
+                            if (item.hasChildren) {
+                                return this.$message.error('请选择末级部门')
+                            }
+                        }
+                    }
                     // 判断必填项
                     let msgs = []
                     if (!this.form.quantity) {

src/views/iosBasicData/aeamends/amendsDetails.vue

@@ -14,8 +14,9 @@
                     v-if="roleName.indexOf('admin') != -1 ? true : roleName.indexOf('报表管理') != -1 ? true : false"
                     :loading="saveLoading" :disabled="!form.id" @click="DesignreportDialog = true">报表设计
                 </el-button>
-                <el-button size="small" type="success" style="margin-right: 8px" v-if="form.status == 0 || form.status == 4"
-                    :disabled="!form.id || editPower" :loading="saveLoading" @click="submitforApproval">提交请核
+                <el-button size="small" type="success" style="margin-right: 8px"
+                    v-if="form.status == 0 || form.status == 4" :disabled="!form.id || editPower" :loading="saveLoading"
+                    @click="submitforApproval">提交请核
                 </el-button>
                 <el-button size="small" type="warning" plain v-if="form.status == 1" :disabled="!form.id || editPower"
                     :loading="saveLoading" @click="revokepleaseReview">撤销请核
@@ -31,28 +32,28 @@
             <el-card class="box-card">
                 <el-form :model="form" ref="form" label-width="90px" class="demo-ruleForm">
                     <el-row>
-                        <el-col :span="5">
+                        <el-col :span="6">
                             <el-form-item label="原M B/L NO" prop="mblno">
-                                <el-input style="width: 100%;" v-model="form.mblno" :disabled="buttonDisable" size="small"
-                                    autocomplete="off" clearable placeholder="请输入原M B/L NO">
+                                <el-input style="width: 100%;" v-model="form.mblno" :disabled="buttonDisable"
+                                    size="small" autocomplete="off" clearable placeholder="请输入原M B/L NO">
                                 </el-input>
                             </el-form-item>
                         </el-col>
-                        <el-col :span="5">
+                        <el-col :span="6">
                             <el-form-item label="原H B/L NO" prop="hblno">
-                                <el-input style="width: 100%;" v-model="form.hblno" :disabled="buttonDisable" size="small"
-                                    autocomplete="off" clearable placeholder="请输入原H B/L NO">
+                                <el-input style="width: 100%;" v-model="form.hblno" :disabled="buttonDisable"
+                                    size="small" autocomplete="off" clearable placeholder="请输入原H B/L NO">
                                 </el-input>
                             </el-form-item>
                         </el-col>
-                        <el-col :span="5">
+                        <el-col :span="6">
                             <el-form-item label="原RET MBLNO" prop="refno" label-width="110px">
-                                <el-input style="width: 100%;" v-model="form.refno" :disabled="buttonDisable" size="small"
-                                    autocomplete="off" clearable placeholder="请输入原RET MBLNO">
+                                <el-input style="width: 100%;" v-model="form.refno" :disabled="buttonDisable"
+                                    size="small" autocomplete="off" clearable placeholder="请输入原RET MBLNO">
                                 </el-input>
                             </el-form-item>
                         </el-col>
-                        <el-col :span="5">
+                        <el-col :span="6">
                             <el-form-item label="AMEND原因" prop="responsibleParty">
                                 <search-query :datalist="responsiblePartyData" :selectValue="form.responsibleParty"
                                     :filterable="true" :disabled="buttonDisable" :clearable="true" :buttonIf="false"
@@ -65,23 +66,24 @@
                         <el-col :span="10">
                             <el-col :span="15">
                                 <el-form-item label="客户名称" prop="corpCnName">
-                                    <el-input style="width: 100%;" v-model="form.corpCnName" size="small" autocomplete="off"
-                                        :disabled="true" clearable placeholder="客户名称">
+                                    <el-input style="width: 100%;" v-model="form.corpCnName" size="small"
+                                        autocomplete="off" :disabled="true" clearable placeholder="客户名称">
                                     </el-input>
                                 </el-form-item>
                             </el-col>
                             <el-col :span="9">
                                 <el-form-item label="" prop="corpEnName" label-width="5px">
-                                    <el-input style="width: 100%;" v-model="form.corpEnName" size="small" autocomplete="off"
-                                        :disabled="true" clearable placeholder="客户名称">
+                                    <el-input style="width: 100%;" v-model="form.corpEnName" size="small"
+                                        autocomplete="off" :disabled="true" clearable placeholder="客户名称">
                                     </el-input>
                                 </el-form-item>
                             </el-col>
                         </el-col>
                         <el-col :span="5">
                             <el-form-item label="业务类型" prop="businessType">
-                                <search-query :datalist="origSeaTypeData" :selectValue="form.origSeaType" :filterable="true"
-                                    :disabled="true" :clearable="true" :buttonIf="false" placeholder="业务类型">
+                                <search-query :datalist="origSeaTypeData" :selectValue="form.origSeaType"
+                                    :filterable="true" :disabled="true" :clearable="true" :buttonIf="false"
+                                    placeholder="业务类型">
                                 </search-query>
                             </el-form-item>
                         </el-col>
@@ -95,16 +97,16 @@
                         <el-col :span="4">
                             <el-form-item label="制单日期" prop="createTime">
                                 <el-date-picker v-model="form.createTime" :clearable="false" style="width: 100%;"
-                                    type="date" size="small" value-format="yyyy-MM-dd HH:mm:ss" :disabled="buttonDisable"
-                                    placeholder="选择制单日期">
+                                    type="date" size="small" value-format="yyyy-MM-dd HH:mm:ss"
+                                    :disabled="buttonDisable" placeholder="选择制单日期">
                                 </el-date-picker>
                             </el-form-item>
                         </el-col>
 
                         <el-col :span="5">
                             <el-form-item label="航空公司" prop="vesselCnName">
-                                <el-input style="width: 100%;" v-model="form.carrierCnName" size="small" autocomplete="off"
-                                    :disabled="true" clearable placeholder="航空公司">
+                                <el-input style="width: 100%;" v-model="form.carrierCnName" size="small"
+                                    autocomplete="off" :disabled="true" clearable placeholder="航空公司">
                                 </el-input>
                             </el-form-item>
                         </el-col>
@@ -145,15 +147,15 @@
                         </el-col>
                         <el-col :span="5">
                             <el-form-item label="毛重" prop="grossWeight">
-                                <el-input style="width: 100%;" v-model="form.grossWeight" size="small" autocomplete="off"
-                                    :disabled="true" clearable placeholder="毛重">
+                                <el-input style="width: 100%;" v-model="form.grossWeight" size="small"
+                                    autocomplete="off" :disabled="true" clearable placeholder="毛重">
                                 </el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="5">
                             <el-form-item label="尺码" prop="measurement">
-                                <el-input style="width: 100%;" v-model="form.measurement" size="small" autocomplete="off"
-                                    :disabled="true" clearable placeholder="尺码">
+                                <el-input style="width: 100%;" v-model="form.measurement" size="small"
+                                    autocomplete="off" :disabled="true" clearable placeholder="尺码">
                                 </el-input>
                             </el-form-item>
                         </el-col>
@@ -164,6 +166,13 @@
                                 </el-input>
                             </el-form-item>
                         </el-col>
+                        <el-col :span="4">
+                            <el-form-item label="业务部门" prop="createDeptName">
+                                <el-input style="width: 100%;" v-model="form.createDeptName" size="small"
+                                    autocomplete="off" :disabled="true" clearable placeholder="业务部门">
+                                </el-input>
+                            </el-form-item>
+                        </el-col>
                         <el-col :span="10">
                             <el-form-item label="原业务备注" prop="origRemarks">
                                 <el-input style="width: 100%;" v-model="form.origRemarks" type="textarea" size="small"
@@ -178,7 +187,7 @@
                                 </el-input>
                             </el-form-item>
                         </el-col>
-                        <el-col :span="4">
+                        <el-col :offset="20" :span="4">
                             <el-form-item label="" prop="billNo" label-width="50px">
                                 <el-button size="small" type="primary" style="margin-right: 8px" :disabled="form.id"
                                     :loading="saveLoading" @click="retrievalfun">提取原业务信息
@@ -205,8 +214,9 @@
                             <i class="el-icon-coin"></i>
                             <span>应收费用</span>
                         </div>
-                        <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="primary"
-                            plain size="small" :disabled="buttonDisable" @click="upwardAddfun('D')">生成amend费用
+                        <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1"
+                            type="primary" plain size="small" :disabled="buttonDisable"
+                            @click="upwardAddfun('D')">生成amend费用
                         </el-button>
                     </div>
                     <billgenerated :tableData="this.form.feeCenterListD" :handleSelectionData="multipleChoiceDArr"
@@ -219,8 +229,9 @@
                             <i class="el-icon-coin"></i>
                             <span>应付费用</span>
                         </div>
-                        <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="primary"
-                            plain size="small" :disabled="buttonDisable" @click="upwardAddfun('C')">生成amend费用
+                        <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1"
+                            type="primary" plain size="small" :disabled="buttonDisable"
+                            @click="upwardAddfun('C')">生成amend费用
                         </el-button>
                     </div>
                     <billgenerated :tableData="this.form.feeCenterListC" :handleSelectionData="multipleChoiceCArr"
@@ -233,8 +244,8 @@
         <el-dialog title="选择数据" class="el-dialogDeep" :visible.sync="retrievePopupsType" append-to-body width="70%"
             :close-on-click-modal="false">
             <div>
-                <avue-crud :option="retrievePopupsOption" :data="retrievePopupsData" ref="retrievePopupsRef" id="out-table"
-                    :header-cell-class-name="headerClassName">
+                <avue-crud :option="retrievePopupsOption" :data="retrievePopupsData" ref="retrievePopupsRef"
+                    id="out-table" :header-cell-class-name="headerClassName">
                     <template slot="menu" slot-scope="{ row }">
                         <el-button type="text" icon="" size="small" @click.stop="retrievePopupsSelect(row)">选择
                         </el-button>
@@ -265,7 +276,8 @@
                             id="out-table" :header-cell-class-name="headerClassName" :row-style="{ height: '20px' }"
                             :cell-style="{ padding: '0px' }">
                             <template slot-scope="scope" slot="menu">
-                                <el-button type="text" size="small" @click="dialogPreviewfun(scope.row)">打印预览</el-button>
+                                <el-button type="text" size="small"
+                                    @click="dialogPreviewfun(scope.row)">打印预览</el-button>
                             </template>
                         </avue-crud>
                     </el-col>
@@ -277,8 +289,8 @@
         </el-dialog>
 
         <!--预览-->
-        <el-dialog title="打印" :visible.sync="selectPrintingDialog" append-to-body width="70%" :close-on-click-modal="false"
-            :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
+        <el-dialog title="打印" :visible.sync="selectPrintingDialog" append-to-body width="70%"
+            :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
             <div>
                 <reportformsList ref="reportformsList" @reportRadio="reportRadio"></reportformsList>
             </div>
@@ -312,7 +324,7 @@ import { aeabillsGetDetail } from "@/api/iosBasicData/aeabills";
 import reportformsList from "@/views/iosBasicData/SeafreightExportF/bills/assembly/reportformsList.vue";
 import { getList as getreportsList } from "@/api/iosBasicData/reports";
 import { contrastObj, contrastList } from "@/util/contrastData";
-
+import { getList as userGetList } from '@/api/system/user'
 export default {
     components: { reportformsList, reportContainer, TreeSelect, reports, SearchQuery, amendsCostdetails, billgenerated },
     data() {
@@ -402,12 +414,16 @@ export default {
             saveLoading: false, // 按钮加载动画
             // 选择的数据
             form: {
+                // operatorName: JSON.parse(localStorage.getItem('saber-userInfo')).content.user_name, // OP 默认登录人
+                // operatorId: JSON.parse(localStorage.getItem('saber-userInfo')).content.user_id, // OP 默认登录人
                 createTime: dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00', // 制单日期 默认 当天,
                 feeCenterListD: [],
                 feeCenterListC: [],
                 feeCenterList: []
             },
             oldForm: {
+                // operatorName: JSON.parse(localStorage.getItem('saber-userInfo')).content.user_name, // OP 默认登录人
+                // operatorId: JSON.parse(localStorage.getItem('saber-userInfo')).content.user_id, // OP 默认登录人
                 createTime: dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00', // 制单日期 默认 当天,
                 feeCenterListD: [],
                 feeCenterListC: [],
@@ -521,8 +537,23 @@ export default {
     },
     created() {
         this.roleName = localStorage.getItem('roleName').split(',')
+        // if (!this.form.id) {
+        //     this.userGetListfun() // 获取用户管理数据
+        // }
     },
     methods: {
+        // 获取用户管理数据
+        userGetListfun(account = undefined, type = false,) {
+            console.log(this.form.operatorName)
+            userGetList(1, 10, { account: this.form.operatorName }, JSON.parse(localStorage.getItem('saber-userInfo')).content.dept_pid.split(',')[0]).then(res => {
+                for (let item of res.data.data.records) {
+                    if (item.name == this.form.operatorName) {
+                        this.$set(this.form, 'createDeptName', item.deptName)
+                        this.$set(this.form, 'createDept', item.deptId)
+                    }
+                }
+            })
+        },
         // 报表预览
         previewreportfun() {
             getreportsList(1, 10, {
@@ -581,7 +612,7 @@ export default {
                 reportCode: this.reportformsObj.classifyCode,
                 groupCode: this.reportformsObj.groupCode,
                 corpIds: row.id,
-                curCode:row.curCode,
+                curCode: row.curCode,
                 type: 'AMEND'
             }).then(res => {
                 this.handleReportPreview(this.reportformsObj.url, res.data.data.data)
@@ -798,14 +829,15 @@ export default {
             this.form.eta = row.eta ? row.eta.slice(0, 10) + ' 00:00:00' : null
             this.form.businessType = 'AEA'
             this.form.createTime = dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00' // 制单日期 默认 当天,
-
+            this.form.createDept = row.accDept
+            this.form.createDeptName = row.accDeptName
             delete this.form.id
             delete this.form.status
             delete this.form.id
             // delete this.form.createUser
             // delete this.form.createUserName
-            delete this.form.createDept
-            delete this.form.createDeptName
+            // delete this.form.createDept
+            // delete this.form.createDeptName
             // delete this.form.createTime
             delete this.form.updateUser
             delete this.form.updateUserName
@@ -1445,7 +1477,8 @@ export default {
     font-size: 16px;
     color: #54BCBD;
 }
-::v-deep .el-card__body{
+
+::v-deep .el-card__body {
     padding: 6px 20px;
 }
 </style>

src/views/iosBasicData/aiamends/amendsDetails.vue

@@ -14,8 +14,9 @@
                     v-if="roleName.indexOf('admin') != -1 ? true : roleName.indexOf('报表管理') != -1 ? true : false"
                     :loading="saveLoading" :disabled="!form.id" @click="DesignreportDialog = true">报表设计
                 </el-button>
-                <el-button size="small" type="success" style="margin-right: 8px" v-if="form.status == 0 || form.status == 4"
-                    :disabled="!form.id || editPower" :loading="saveLoading" @click="submitforApproval">提交请核
+                <el-button size="small" type="success" style="margin-right: 8px"
+                    v-if="form.status == 0 || form.status == 4" :disabled="!form.id || editPower" :loading="saveLoading"
+                    @click="submitforApproval">提交请核
                 </el-button>
                 <el-button size="small" type="warning" plain v-if="form.status == 1" :disabled="!form.id || editPower"
                     :loading="saveLoading" @click="revokepleaseReview">撤销请核
@@ -33,22 +34,22 @@
                     <el-row>
                         <el-col :span="5">
                             <el-form-item label="原M B/L NO" prop="mblno">
-                                <el-input style="width: 100%;" v-model="form.mblno" :disabled="buttonDisable" size="small"
-                                    autocomplete="off" clearable placeholder="请输入原M B/L NO">
+                                <el-input style="width: 100%;" v-model="form.mblno" :disabled="buttonDisable"
+                                    size="small" autocomplete="off" clearable placeholder="请输入原M B/L NO">
                                 </el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="5">
                             <el-form-item label="原H B/L NO" prop="hblno">
-                                <el-input style="width: 100%;" v-model="form.hblno" :disabled="buttonDisable" size="small"
-                                    autocomplete="off" clearable placeholder="请输入原H B/L NO">
+                                <el-input style="width: 100%;" v-model="form.hblno" :disabled="buttonDisable"
+                                    size="small" autocomplete="off" clearable placeholder="请输入原H B/L NO">
                                 </el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="5">
                             <el-form-item label="原外提单号" prop="refno">
-                                <el-input style="width: 100%;" v-model="form.refno" :disabled="buttonDisable" size="small"
-                                    autocomplete="off" clearable placeholder="请输入原外提单号">
+                                <el-input style="width: 100%;" v-model="form.refno" :disabled="buttonDisable"
+                                    size="small" autocomplete="off" clearable placeholder="请输入原外提单号">
                                 </el-input>
                             </el-form-item>
                         </el-col>
@@ -72,23 +73,24 @@
                         <el-col :span="10">
                             <el-col :span="15">
                                 <el-form-item label="客户名称" prop="corpCnName">
-                                    <el-input style="width: 100%;" v-model="form.corpCnName" size="small" autocomplete="off"
-                                        :disabled="true" clearable placeholder="客户名称">
+                                    <el-input style="width: 100%;" v-model="form.corpCnName" size="small"
+                                        autocomplete="off" :disabled="true" clearable placeholder="客户名称">
                                     </el-input>
                                 </el-form-item>
                             </el-col>
                             <el-col :span="9">
                                 <el-form-item label="" prop="corpEnName" label-width="5px">
-                                    <el-input style="width: 100%;" v-model="form.corpEnName" size="small" autocomplete="off"
-                                        :disabled="true" clearable placeholder="客户名称">
+                                    <el-input style="width: 100%;" v-model="form.corpEnName" size="small"
+                                        autocomplete="off" :disabled="true" clearable placeholder="客户名称">
                                     </el-input>
                                 </el-form-item>
                             </el-col>
                         </el-col>
                         <el-col :span="5">
                             <el-form-item label="业务类型" prop="businessType">
-                                <search-query :datalist="origSeaTypeData" :selectValue="form.origSeaType" :filterable="true"
-                                    :disabled="true" :clearable="true" :buttonIf="false" placeholder="业务类型">
+                                <search-query :datalist="origSeaTypeData" :selectValue="form.origSeaType"
+                                    :filterable="true" :disabled="true" :clearable="true" :buttonIf="false"
+                                    placeholder="业务类型">
                                 </search-query>
                             </el-form-item>
                         </el-col>
@@ -110,8 +112,8 @@
 
                         <el-col :span="5">
                             <el-form-item label="船名" prop="vesselCnName">
-                                <el-input style="width: 100%;" v-model="form.vesselCnName" size="small" autocomplete="off"
-                                    :disabled="true" clearable placeholder="船名">
+                                <el-input style="width: 100%;" v-model="form.vesselCnName" size="small"
+                                    autocomplete="off" :disabled="true" clearable placeholder="船名">
                                 </el-input>
                             </el-form-item>
                         </el-col>
@@ -152,15 +154,15 @@
                         </el-col>
                         <el-col :span="5">
                             <el-form-item label="毛重" prop="grossWeight">
-                                <el-input style="width: 100%;" v-model="form.grossWeight" size="small" autocomplete="off"
-                                    :disabled="true" clearable placeholder="毛重">
+                                <el-input style="width: 100%;" v-model="form.grossWeight" size="small"
+                                    autocomplete="off" :disabled="true" clearable placeholder="毛重">
                                 </el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="5">
                             <el-form-item label="尺码" prop="measurement">
-                                <el-input style="width: 100%;" v-model="form.measurement" size="small" autocomplete="off"
-                                    :disabled="true" clearable placeholder="尺码">
+                                <el-input style="width: 100%;" v-model="form.measurement" size="small"
+                                    autocomplete="off" :disabled="true" clearable placeholder="尺码">
                                 </el-input>
                             </el-form-item>
                         </el-col>
@@ -171,6 +173,13 @@
                                 </el-input>
                             </el-form-item>
                         </el-col>
+                        <el-col :span="4">
+                            <el-form-item label="业务部门" prop="createDeptName">
+                                <el-input style="width: 100%;" v-model="form.createDeptName" size="small"
+                                    autocomplete="off" :disabled="true" clearable placeholder="业务部门">
+                                </el-input>
+                            </el-form-item>
+                        </el-col>
                         <el-col :span="10">
                             <el-form-item label="原业务备注" prop="origRemarks">
                                 <el-input style="width: 100%;" v-model="form.origRemarks" type="textarea" size="small"
@@ -185,7 +194,7 @@
                                 </el-input>
                             </el-form-item>
                         </el-col>
-                        <el-col :span="4">
+                        <el-col :offset="20" :span="4">
                             <el-form-item label="" prop="billNo" label-width="50px">
                                 <el-button size="small" type="primary" style="margin-right: 8px" :disabled="form.id"
                                     :loading="saveLoading" @click="retrievalfun">提取原业务信息
@@ -213,8 +222,9 @@
                             <i class="el-icon-coin"></i>
                             <span>应收费用</span>
                         </div>
-                        <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="primary"
-                            plain size="small" :disabled="buttonDisable" @click="upwardAddfun('D')">生成amend费用
+                        <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1"
+                            type="primary" plain size="small" :disabled="buttonDisable"
+                            @click="upwardAddfun('D')">生成amend费用
                         </el-button>
                     </div>
                     <billgenerated :tableData="this.form.feeCenterListD" :handleSelectionData="multipleChoiceDArr"
@@ -227,8 +237,9 @@
                             <i class="el-icon-coin"></i>
                             <span>应付费用</span>
                         </div>
-                        <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="primary"
-                            plain size="small" :disabled="buttonDisable" @click="upwardAddfun('C')">生成amend费用
+                        <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1"
+                            type="primary" plain size="small" :disabled="buttonDisable"
+                            @click="upwardAddfun('C')">生成amend费用
                         </el-button>
                     </div>
                     <billgenerated :tableData="this.form.feeCenterListC" :handleSelectionData="multipleChoiceCArr"
@@ -241,8 +252,8 @@
         <el-dialog title="选择数据" class="el-dialogDeep" :visible.sync="retrievePopupsType" append-to-body width="70%"
             :close-on-click-modal="false">
             <div>
-                <avue-crud :option="retrievePopupsOption" :data="retrievePopupsData" ref="retrievePopupsRef" id="out-table"
-                    :header-cell-class-name="headerClassName">
+                <avue-crud :option="retrievePopupsOption" :data="retrievePopupsData" ref="retrievePopupsRef"
+                    id="out-table" :header-cell-class-name="headerClassName">
                     <template slot="menu" slot-scope="{ row }">
                         <el-button type="text" icon="" size="small" @click.stop="retrievePopupsSelect(row)">选择
                         </el-button>
@@ -273,7 +284,8 @@
                             id="out-table" :header-cell-class-name="headerClassName" :row-style="{ height: '20px' }"
                             :cell-style="{ padding: '0px' }">
                             <template slot-scope="scope" slot="menu">
-                                <el-button type="text" size="small" @click="dialogPreviewfun(scope.row)">打印预览</el-button>
+                                <el-button type="text" size="small"
+                                    @click="dialogPreviewfun(scope.row)">打印预览</el-button>
                             </template>
                         </avue-crud>
                     </el-col>
@@ -285,8 +297,8 @@
         </el-dialog>
 
         <!--预览-->
-        <el-dialog title="打印" :visible.sync="selectPrintingDialog" append-to-body width="70%" :close-on-click-modal="false"
-            :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
+        <el-dialog title="打印" :visible.sync="selectPrintingDialog" append-to-body width="70%"
+            :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
             <div>
                 <reportformsList ref="reportformsList" @reportRadio="reportRadio"></reportformsList>
             </div>
@@ -320,6 +332,7 @@ import reportformsList from "@/views/iosBasicData/SeafreightExportF/bills/assemb
 import { aeabillsGetDetail } from "@/api/iosBasicData/aeabills";
 import { getList as getreportsList } from "@/api/iosBasicData/reports";
 import { contrastObj, contrastList } from "@/util/contrastData";
+import { getList as userGetList } from '@/api/system/user'
 export default {
     components: { reportformsList, reportContainer, TreeSelect, reports, SearchQuery, amendsCostdetails, billgenerated },
     data() {
@@ -415,12 +428,16 @@ export default {
             saveLoading: false, // 按钮加载动画
             // 选择的数据
             form: {
+                // operatorName: JSON.parse(localStorage.getItem('saber-userInfo')).content.user_name, // OP 默认登录人
+                // operatorId: JSON.parse(localStorage.getItem('saber-userInfo')).content.user_id, // OP 默认登录人
                 voucherDate: dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00', // 制单日期 默认 当天,
                 feeCenterListD: [],
                 feeCenterListC: [],
                 feeCenterList: []
             },
             oldForm: {
+                // operatorName: JSON.parse(localStorage.getItem('saber-userInfo')).content.user_name, // OP 默认登录人
+                // operatorId: JSON.parse(localStorage.getItem('saber-userInfo')).content.user_id, // OP 默认登录人
                 voucherDate: dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00', // 制单日期 默认 当天,
                 feeCenterListD: [],
                 feeCenterListC: [],
@@ -810,14 +827,15 @@ export default {
             this.form.eta = row.eta ? row.eta.slice(0, 10) + ' 00:00:00' : null
             this.form.businessType = 'AIA'
             this.form.voucherDate = dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00' // 制单日期 默认 当天,
-
+            this.form.createDept = row.accDept
+            this.form.createDeptName = row.accDeptName
             delete this.form.id
             delete this.form.status
             delete this.form.id
             // delete this.form.createUser
             // delete this.form.createUserName
-            delete this.form.createDept
-            delete this.form.createDeptName
+            // delete this.form.createDept
+            // delete this.form.createDeptName
             // delete this.form.createTime
             delete this.form.updateUser
             delete this.form.updateUserName
@@ -1457,7 +1475,8 @@ export default {
     font-size: 16px;
     color: #54BCBD;
 }
-::v-deep .el-card__body{
+
+::v-deep .el-card__body {
     padding: 6px 20px;
 }
 </style>

src/views/iosBasicData/airFreight/manifestAmend/detailsPage.vue

@@ -14,8 +14,9 @@
                     v-if="roleName.indexOf('admin') != -1 ? true : roleName.indexOf('报表管理') != -1 ? true : false"
                     :loading="saveLoading" :disabled="!form.id" @click="DesignreportDialog = true">报表设计
                 </el-button>
-                <el-button size="small" type="success" style="margin-right: 8px" v-if="form.status == 0 || form.status == 4"
-                    :disabled="!form.id || editPower" :loading="saveLoading" @click="submitforApproval">提交请核
+                <el-button size="small" type="success" style="margin-right: 8px"
+                    v-if="form.status == 0 || form.status == 4" :disabled="!form.id || editPower" :loading="saveLoading"
+                    @click="submitforApproval">提交请核
                 </el-button>
                 <el-button size="small" type="warning" plain v-if="form.status == 1" :disabled="!form.id || editPower"
                     :loading="saveLoading" @click="revokepleaseReview">撤销请核
@@ -33,22 +34,22 @@
                     <el-row>
                         <el-col :span="6">
                             <el-form-item label="原M B/L NO" prop="mblno">
-                                <el-input style="width: 100%;" v-model="form.mblno" :disabled="buttonDisable" size="small"
-                                    autocomplete="off" clearable placeholder="请输入原M B/L NO">
+                                <el-input style="width: 100%;" v-model="form.mblno" :disabled="buttonDisable"
+                                    size="small" autocomplete="off" clearable placeholder="请输入原M B/L NO">
                                 </el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="6">
                             <el-form-item label="原H B/L NO" prop="hblno">
-                                <el-input style="width: 100%;" v-model="form.hblno"  :disabled="true"  size="small"
+                                <el-input style="width: 100%;" v-model="form.hblno" :disabled="true" size="small"
                                     autocomplete="off" clearable placeholder="请输入原H B/L NO">
                                 </el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="6">
                             <el-form-item label="原外提单号" prop="refno">
-                                <el-input style="width: 100%;" v-model="form.refno" :disabled="buttonDisable" size="small"
-                                    autocomplete="off" clearable placeholder="请输入原外提单号">
+                                <el-input style="width: 100%;" v-model="form.refno" :disabled="buttonDisable"
+                                    size="small" autocomplete="off" clearable placeholder="请输入原外提单号">
                                 </el-input>
                             </el-form-item>
                         </el-col>
@@ -72,23 +73,24 @@
                         <el-col :span="10">
                             <el-col :span="15">
                                 <el-form-item label="客户名称" prop="corpCnName">
-                                    <el-input style="width: 100%;" v-model="form.corpCnName" size="small" autocomplete="off"
-                                        :disabled="true" clearable placeholder="客户名称">
+                                    <el-input style="width: 100%;" v-model="form.corpCnName" size="small"
+                                        autocomplete="off" :disabled="true" clearable placeholder="客户名称">
                                     </el-input>
                                 </el-form-item>
                             </el-col>
                             <el-col :span="9">
                                 <el-form-item label="" prop="corpEnName" label-width="5px">
-                                    <el-input style="width: 100%;" v-model="form.corpEnName" size="small" autocomplete="off"
-                                        :disabled="true" clearable placeholder="客户名称">
+                                    <el-input style="width: 100%;" v-model="form.corpEnName" size="small"
+                                        autocomplete="off" :disabled="true" clearable placeholder="客户名称">
                                     </el-input>
                                 </el-form-item>
                             </el-col>
                         </el-col>
                         <el-col :span="5">
                             <el-form-item label="业务类型" prop="businessType">
-                                <search-query :datalist="origSeaTypeData" :selectValue="form.origSeaType" :filterable="true"
-                                    :disabled="true" :clearable="true" :buttonIf="false" placeholder="业务类型">
+                                <search-query :datalist="origSeaTypeData" :selectValue="form.origSeaType"
+                                    :filterable="true" :disabled="true" :clearable="true" :buttonIf="false"
+                                    placeholder="业务类型">
                                 </search-query>
                             </el-form-item>
                         </el-col>
@@ -102,16 +104,16 @@
                         <el-col :span="4">
                             <el-form-item label="账单日期" prop="createTime">
                                 <el-date-picker v-model="form.createTime" :clearable="false" style="width: 100%;"
-                                    type="date" size="small" value-format="yyyy-MM-dd HH:mm:ss" :disabled="buttonDisable"
-                                    placeholder="选择账单日期">
+                                    type="date" size="small" value-format="yyyy-MM-dd HH:mm:ss"
+                                    :disabled="buttonDisable" placeholder="选择账单日期">
                                 </el-date-picker>
                             </el-form-item>
                         </el-col>
 
                         <el-col :span="5">
                             <el-form-item label="船名" prop="vesselCnName">
-                                <el-input style="width: 100%;" v-model="form.vesselCnName" size="small" autocomplete="off"
-                                    :disabled="true" clearable placeholder="船名">
+                                <el-input style="width: 100%;" v-model="form.vesselCnName" size="small"
+                                    autocomplete="off" :disabled="true" clearable placeholder="船名">
                                 </el-input>
                             </el-form-item>
                         </el-col>
@@ -152,15 +154,15 @@
                         </el-col>
                         <el-col :span="5">
                             <el-form-item label="毛重" prop="grossWeight">
-                                <el-input style="width: 100%;" v-model="form.grossWeight" size="small" autocomplete="off"
-                                    :disabled="true" clearable placeholder="毛重">
+                                <el-input style="width: 100%;" v-model="form.grossWeight" size="small"
+                                    autocomplete="off" :disabled="true" clearable placeholder="毛重">
                                 </el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="5">
                             <el-form-item label="尺码" prop="measurement">
-                                <el-input style="width: 100%;" v-model="form.measurement" size="small" autocomplete="off"
-                                    :disabled="true" clearable placeholder="尺码">
+                                <el-input style="width: 100%;" v-model="form.measurement" size="small"
+                                    autocomplete="off" :disabled="true" clearable placeholder="尺码">
                                 </el-input>
                             </el-form-item>
                         </el-col>
@@ -171,6 +173,13 @@
                                 </el-input>
                             </el-form-item>
                         </el-col>
+                        <el-col :span="6">
+                            <el-form-item label="业务部门" prop="createDeptName">
+                                <el-input style="width: 100%;" v-model="form.createDeptName" size="small"
+                                    autocomplete="off" :disabled="true" clearable placeholder="业务部门">
+                                </el-input>
+                            </el-form-item>
+                        </el-col>
                         <el-col :span="10">
                             <el-form-item label="原业务备注" prop="origRemarks">
                                 <el-input style="width: 100%;" v-model="form.origRemarks" type="textarea" size="small"
@@ -185,7 +194,7 @@
                                 </el-input>
                             </el-form-item>
                         </el-col>
-                        <el-col :span="6">
+                        <el-col :offset="18" :span="6">
                             <el-form-item label-width="50px">
                                 <el-button size="small" type="warning" style="margin-right: 8px" :disabled="form.id"
                                     :loading="saveLoading" @click="emptyConditionfun">一键清空
@@ -243,8 +252,8 @@
         <el-dialog title="选择数据" class="el-dialogDeep" :visible.sync="retrievePopupsType" append-to-body width="70%"
             :close-on-click-modal="false">
             <div>
-                <avue-crud :option="retrievePopupsOption" :data="retrievePopupsData" ref="retrievePopupsRef" id="out-table"
-                    :header-cell-class-name="headerClassName">
+                <avue-crud :option="retrievePopupsOption" :data="retrievePopupsData" ref="retrievePopupsRef"
+                    id="out-table" :header-cell-class-name="headerClassName">
                     <template slot="menu" slot-scope="{ row }">
                         <el-button type="text" icon="" size="small" @click.stop="retrievePopupsSelect(row)">选择
                         </el-button>
@@ -274,7 +283,8 @@
                             id="out-table" :header-cell-class-name="headerClassName" :row-style="{ height: '20px' }"
                             :cell-style="{ padding: '0px' }">
                             <template slot-scope="scope" slot="menu">
-                                <el-button type="text" size="small" @click="dialogPreviewfun(scope.row)">打印预览</el-button>
+                                <el-button type="text" size="small"
+                                    @click="dialogPreviewfun(scope.row)">打印预览</el-button>
                             </template>
                         </avue-crud>
                     </el-col>
@@ -286,8 +296,8 @@
         </el-dialog>
 
         <!--预览-->
-        <el-dialog title="打印" :visible.sync="selectPrintingDialog" append-to-body width="70%" :close-on-click-modal="false"
-            :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
+        <el-dialog title="打印" :visible.sync="selectPrintingDialog" append-to-body width="70%"
+            :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
             <div>
                 <reportformsList ref="reportformsList" @reportRadio="reportRadio"></reportformsList>
             </div>
@@ -575,8 +585,8 @@ export default {
                     this.$nextTick(() => {
                         this.$refs.reportformsList.onLoad(page, {
                             businessType: 'AMEND',
-                           classifyCode: 'MFAA',
-                groupCode: 'MFAA'
+                            classifyCode: 'MFAA',
+                            groupCode: 'MFAA'
                         })
                     })
                 }
@@ -831,14 +841,15 @@ export default {
             this.form.eta = row.eta ? row.eta.slice(0, 10) + ' 00:00:00' : null
             this.form.businessType = 'MFAA'
             this.form.createTime = dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00' // 制单日期 默认 当天,
-
+            this.form.createDept = row.accDept
+            this.form.createDeptName = row.accDeptName
             delete this.form.id
             delete this.form.status
             delete this.form.id
             // delete this.form.createUser
             // delete this.form.createUserName
-            delete this.form.createDept
-            delete this.form.createDeptName
+            // delete this.form.createDept
+            // delete this.form.createDeptName
             // delete this.form.createTime
             delete this.form.updateUser
             delete this.form.updateUserName
@@ -1038,7 +1049,7 @@ export default {
             // 判断必填项
             let sum = '请输入'
             for (let item of this.form.feeCenterList) {
-                let i=1
+                let i = 1
                 if (!item.dc) {
                     sum += ` 应收序号${i}收/付`
                 }
@@ -1504,7 +1515,8 @@ export default {
     font-size: 16px;
     color: #54BCBD;
 }
-::v-deep .el-card__body{
+
+::v-deep .el-card__body {
     padding: 6px 20px;
 }
 </style>

src/views/iosBasicData/fastMail/fastMailAmend/detailsPage.vue

@@ -14,8 +14,9 @@
                     v-if="roleName.indexOf('admin') != -1 ? true : roleName.indexOf('报表管理') != -1 ? true : false"
                     :loading="saveLoading" :disabled="!form.id" @click="DesignreportDialog = true">报表设计
                 </el-button>
-                <el-button size="small" type="success" style="margin-right: 8px" v-if="form.status == 0 || form.status == 4"
-                    :disabled="!form.id || editPower" :loading="saveLoading" @click="submitforApproval">提交请核
+                <el-button size="small" type="success" style="margin-right: 8px"
+                    v-if="form.status == 0 || form.status == 4" :disabled="!form.id || editPower" :loading="saveLoading"
+                    @click="submitforApproval">提交请核
                 </el-button>
                 <el-button size="small" type="warning" plain v-if="form.status == 1" :disabled="!form.id || editPower"
                     :loading="saveLoading" @click="revokepleaseReview">撤销请核
@@ -33,22 +34,22 @@
                     <el-row>
                         <el-col :span="6">
                             <el-form-item label="原M B/L NO" prop="mblno">
-                                <el-input style="width: 100%;" v-model="form.mblno" :disabled="buttonDisable" size="small"
-                                    autocomplete="off" clearable placeholder="请输入原M B/L NO">
+                                <el-input style="width: 100%;" v-model="form.mblno" :disabled="buttonDisable"
+                                    size="small" autocomplete="off" clearable placeholder="请输入原M B/L NO">
                                 </el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="6">
                             <el-form-item label="原H B/L NO" prop="hblno">
-                                <el-input style="width: 100%;" v-model="form.hblno" :disabled="buttonDisable" size="small"
-                                    autocomplete="off" clearable placeholder="请输入原H B/L NO">
+                                <el-input style="width: 100%;" v-model="form.hblno" :disabled="buttonDisable"
+                                    size="small" autocomplete="off" clearable placeholder="请输入原H B/L NO">
                                 </el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="6">
                             <el-form-item label="原外提单号" prop="refno">
-                                <el-input style="width: 100%;" v-model="form.refno" :disabled="buttonDisable" size="small"
-                                    autocomplete="off" clearable placeholder="请输入原外提单号">
+                                <el-input style="width: 100%;" v-model="form.refno" :disabled="buttonDisable"
+                                    size="small" autocomplete="off" clearable placeholder="请输入原外提单号">
                                 </el-input>
                             </el-form-item>
                         </el-col>
@@ -72,23 +73,24 @@
                         <el-col :span="10">
                             <el-col :span="15">
                                 <el-form-item label="客户名称" prop="corpCnName">
-                                    <el-input style="width: 100%;" v-model="form.corpCnName" size="small" autocomplete="off"
-                                        :disabled="true" clearable placeholder="客户名称">
+                                    <el-input style="width: 100%;" v-model="form.corpCnName" size="small"
+                                        autocomplete="off" :disabled="true" clearable placeholder="客户名称">
                                     </el-input>
                                 </el-form-item>
                             </el-col>
                             <el-col :span="9">
                                 <el-form-item label="" prop="corpEnName" label-width="5px">
-                                    <el-input style="width: 100%;" v-model="form.corpEnName" size="small" autocomplete="off"
-                                        :disabled="true" clearable placeholder="客户名称">
+                                    <el-input style="width: 100%;" v-model="form.corpEnName" size="small"
+                                        autocomplete="off" :disabled="true" clearable placeholder="客户名称">
                                     </el-input>
                                 </el-form-item>
                             </el-col>
                         </el-col>
                         <el-col :span="5">
                             <el-form-item label="业务类型" prop="businessType">
-                                <search-query :datalist="origSeaTypeData" :selectValue="form.origSeaType" :filterable="true"
-                                    :disabled="true" :clearable="true" :buttonIf="false" placeholder="业务类型">
+                                <search-query :datalist="origSeaTypeData" :selectValue="form.origSeaType"
+                                    :filterable="true" :disabled="true" :clearable="true" :buttonIf="false"
+                                    placeholder="业务类型">
                                 </search-query>
                             </el-form-item>
                         </el-col>
@@ -102,16 +104,16 @@
                         <el-col :span="4">
                             <el-form-item label="账单日期" prop="createTime">
                                 <el-date-picker v-model="form.createTime" :clearable="false" style="width: 100%;"
-                                    type="date" size="small" value-format="yyyy-MM-dd HH:mm:ss" :disabled="buttonDisable"
-                                    placeholder="选择账单日期">
+                                    type="date" size="small" value-format="yyyy-MM-dd HH:mm:ss"
+                                    :disabled="buttonDisable" placeholder="选择账单日期">
                                 </el-date-picker>
                             </el-form-item>
                         </el-col>
 
                         <el-col :span="5">
                             <el-form-item label="船名" prop="vesselCnName">
-                                <el-input style="width: 100%;" v-model="form.vesselCnName" size="small" autocomplete="off"
-                                    :disabled="true" clearable placeholder="船名">
+                                <el-input style="width: 100%;" v-model="form.vesselCnName" size="small"
+                                    autocomplete="off" :disabled="true" clearable placeholder="船名">
                                 </el-input>
                             </el-form-item>
                         </el-col>
@@ -152,15 +154,15 @@
                         </el-col>
                         <el-col :span="5">
                             <el-form-item label="毛重" prop="grossWeight">
-                                <el-input style="width: 100%;" v-model="form.grossWeight" size="small" autocomplete="off"
-                                    :disabled="true" clearable placeholder="毛重">
+                                <el-input style="width: 100%;" v-model="form.grossWeight" size="small"
+                                    autocomplete="off" :disabled="true" clearable placeholder="毛重">
                                 </el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="5">
                             <el-form-item label="尺码" prop="measurement">
-                                <el-input style="width: 100%;" v-model="form.measurement" size="small" autocomplete="off"
-                                    :disabled="true" clearable placeholder="尺码">
+                                <el-input style="width: 100%;" v-model="form.measurement" size="small"
+                                    autocomplete="off" :disabled="true" clearable placeholder="尺码">
                                 </el-input>
                             </el-form-item>
                         </el-col>
@@ -171,6 +173,13 @@
                                 </el-input>
                             </el-form-item>
                         </el-col>
+                             <el-col :span="6">
+                            <el-form-item label="业务部门" prop="createDeptName">
+                                <el-input style="width: 100%;" v-model="form.createDeptName" size="small"
+                                    autocomplete="off" :disabled="true" clearable placeholder="业务部门">
+                                </el-input>
+                            </el-form-item>
+                        </el-col>
                         <el-col :span="10">
                             <el-form-item label="原业务备注" prop="origRemarks">
                                 <el-input style="width: 100%;" v-model="form.origRemarks" type="textarea" size="small"
@@ -185,7 +194,7 @@
                                 </el-input>
                             </el-form-item>
                         </el-col>
-                        <el-col :span="6">
+                        <el-col :offset="18" :span="6">
                             <el-form-item label-width="50px">
                                 <el-button size="small" type="warning" style="margin-right: 8px" :disabled="form.id"
                                     :loading="saveLoading" @click="emptyConditionfun">一键清空
@@ -243,8 +252,8 @@
         <el-dialog title="选择数据" class="el-dialogDeep" :visible.sync="retrievePopupsType" append-to-body width="70%"
             :close-on-click-modal="false">
             <div>
-                <avue-crud :option="retrievePopupsOption" :data="retrievePopupsData" ref="retrievePopupsRef" id="out-table"
-                    :header-cell-class-name="headerClassName">
+                <avue-crud :option="retrievePopupsOption" :data="retrievePopupsData" ref="retrievePopupsRef"
+                    id="out-table" :header-cell-class-name="headerClassName">
                     <template slot="menu" slot-scope="{ row }">
                         <el-button type="text" icon="" size="small" @click.stop="retrievePopupsSelect(row)">选择
                         </el-button>
@@ -274,7 +283,8 @@
                             id="out-table" :header-cell-class-name="headerClassName" :row-style="{ height: '20px' }"
                             :cell-style="{ padding: '0px' }">
                             <template slot-scope="scope" slot="menu">
-                                <el-button type="text" size="small" @click="dialogPreviewfun(scope.row)">打印预览</el-button>
+                                <el-button type="text" size="small"
+                                    @click="dialogPreviewfun(scope.row)">打印预览</el-button>
                             </template>
                         </avue-crud>
                     </el-col>
@@ -286,8 +296,8 @@
         </el-dialog>
 
         <!--预览-->
-        <el-dialog title="打印" :visible.sync="selectPrintingDialog" append-to-body width="70%" :close-on-click-modal="false"
-            :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
+        <el-dialog title="打印" :visible.sync="selectPrintingDialog" append-to-body width="70%"
+            :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
             <div>
                 <reportformsList ref="reportformsList" @reportRadio="reportRadio"></reportformsList>
             </div>
@@ -831,14 +841,15 @@ export default {
             this.form.eta = row.eta ? row.eta.slice(0, 10) + ' 00:00:00' : null
             this.form.businessType = 'EXPA'
             this.form.createTime = dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00' // 制单日期 默认 当天,
-
+            this.form.createDept = row.accDept
+            this.form.createDeptName = row.accDeptName
             delete this.form.id
             delete this.form.status
             delete this.form.id
             // delete this.form.createUser
             // delete this.form.createUserName
-            delete this.form.createDept
-            delete this.form.createDeptName
+            // delete this.form.createDept
+            // delete this.form.createDeptName
             // delete this.form.createTime
             delete this.form.updateUser
             delete this.form.updateUserName
@@ -1038,7 +1049,7 @@ export default {
             // 判断必填项
             let sum = '请输入'
             for (let item of this.form.feeCenterList) {
-                let i=1
+                let i = 1
                 if (!item.dc) {
                     sum += ` 应收序号${i}收/付`
                 }
@@ -1504,7 +1515,8 @@ export default {
     font-size: 16px;
     color: #54BCBD;
 }
-::v-deep .el-card__body{
+
+::v-deep .el-card__body {
     padding: 6px 20px;
 }
 </style>

src/views/iosBasicData/oceanShipping/manifestAmend/detailsPage.vue

@@ -171,6 +171,13 @@
                                 </el-input>
                             </el-form-item>
                         </el-col>
+                             <el-col :span="6">
+                            <el-form-item label="业务部门" prop="createDeptName">
+                                <el-input style="width: 100%;" v-model="form.createDeptName" size="small"
+                                    autocomplete="off" :disabled="true" clearable placeholder="业务部门">
+                                </el-input>
+                            </el-form-item>
+                        </el-col>
                         <el-col :span="10">
                             <el-form-item label="原业务备注" prop="origRemarks">
                                 <el-input style="width: 100%;" v-model="form.origRemarks" type="textarea" size="small"
@@ -185,7 +192,7 @@
                                 </el-input>
                             </el-form-item>
                         </el-col>
-                        <el-col :span="6">
+                        <el-col :offset="18" :span="6">
                             <el-form-item label-width="50px">
                                 <el-button size="small" type="warning" style="margin-right: 8px" :disabled="form.id"
                                     :loading="saveLoading" @click="emptyConditionfun">一键清空
@@ -831,14 +838,15 @@ export default {
             this.form.eta = row.eta ? row.eta.slice(0, 10) + ' 00:00:00' : null
             this.form.businessType = 'MFSA'
             this.form.createTime = dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00' // 制单日期 默认 当天,
-
+  this.form.createDept = row.accDept
+            this.form.createDeptName = row.accDeptName
             delete this.form.id
             delete this.form.status
             delete this.form.id
             // delete this.form.createUser
             // delete this.form.createUserName
-            delete this.form.createDept
-            delete this.form.createDeptName
+            // delete this.form.createDept
+            // delete this.form.createDeptName
             // delete this.form.createTime
             delete this.form.updateUser
             delete this.form.updateUserName

src/views/iosBasicData/oceanShippingCar/dispatchCarAmend/detailsPage.vue

@@ -14,8 +14,9 @@
                     v-if="roleName.indexOf('admin') != -1 ? true : roleName.indexOf('报表管理') != -1 ? true : false"
                     :loading="saveLoading" :disabled="!form.id" @click="DesignreportDialog = true">报表设计
                 </el-button>
-                <el-button size="small" type="success" style="margin-right: 8px" v-if="form.status == 0 || form.status == 4"
-                    :disabled="!form.id || editPower" :loading="saveLoading" @click="submitforApproval">提交请核
+                <el-button size="small" type="success" style="margin-right: 8px"
+                    v-if="form.status == 0 || form.status == 4" :disabled="!form.id || editPower" :loading="saveLoading"
+                    @click="submitforApproval">提交请核
                 </el-button>
                 <el-button size="small" type="warning" plain v-if="form.status == 1" :disabled="!form.id || editPower"
                     :loading="saveLoading" @click="revokepleaseReview">撤销请核
@@ -33,22 +34,22 @@
                     <el-row>
                         <el-col :span="6">
                             <el-form-item label="原M B/L NO" prop="mblno">
-                                <el-input style="width: 100%;" v-model="form.mblno" :disabled="buttonDisable" size="small"
-                                    autocomplete="off" clearable placeholder="请输入原M B/L NO">
+                                <el-input style="width: 100%;" v-model="form.mblno" :disabled="buttonDisable"
+                                    size="small" autocomplete="off" clearable placeholder="请输入原M B/L NO">
                                 </el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="6">
                             <el-form-item label="原H B/L NO" prop="hblno">
-                                <el-input style="width: 100%;" v-model="form.hblno" :disabled="buttonDisable" size="small"
-                                    autocomplete="off" clearable placeholder="请输入原H B/L NO">
+                                <el-input style="width: 100%;" v-model="form.hblno" :disabled="buttonDisable"
+                                    size="small" autocomplete="off" clearable placeholder="请输入原H B/L NO">
                                 </el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="6">
                             <el-form-item label="原外提单号" prop="refno">
-                                <el-input style="width: 100%;" v-model="form.refno" :disabled="buttonDisable" size="small"
-                                    autocomplete="off" clearable placeholder="请输入原外提单号">
+                                <el-input style="width: 100%;" v-model="form.refno" :disabled="buttonDisable"
+                                    size="small" autocomplete="off" clearable placeholder="请输入原外提单号">
                                 </el-input>
                             </el-form-item>
                         </el-col>
@@ -72,23 +73,24 @@
                         <el-col :span="10">
                             <el-col :span="15">
                                 <el-form-item label="客户名称" prop="corpCnName">
-                                    <el-input style="width: 100%;" v-model="form.corpCnName" size="small" autocomplete="off"
-                                        :disabled="true" clearable placeholder="客户名称">
+                                    <el-input style="width: 100%;" v-model="form.corpCnName" size="small"
+                                        autocomplete="off" :disabled="true" clearable placeholder="客户名称">
                                     </el-input>
                                 </el-form-item>
                             </el-col>
                             <el-col :span="9">
                                 <el-form-item label="" prop="corpEnName" label-width="5px">
-                                    <el-input style="width: 100%;" v-model="form.corpEnName" size="small" autocomplete="off"
-                                        :disabled="true" clearable placeholder="客户名称">
+                                    <el-input style="width: 100%;" v-model="form.corpEnName" size="small"
+                                        autocomplete="off" :disabled="true" clearable placeholder="客户名称">
                                     </el-input>
                                 </el-form-item>
                             </el-col>
                         </el-col>
                         <el-col :span="5">
                             <el-form-item label="业务类型" prop="businessType">
-                                <search-query :datalist="origSeaTypeData" :selectValue="form.origSeaType" :filterable="true"
-                                    :disabled="true" :clearable="true" :buttonIf="false" placeholder="业务类型">
+                                <search-query :datalist="origSeaTypeData" :selectValue="form.origSeaType"
+                                    :filterable="true" :disabled="true" :clearable="true" :buttonIf="false"
+                                    placeholder="业务类型">
                                 </search-query>
                             </el-form-item>
                         </el-col>
@@ -102,16 +104,16 @@
                         <el-col :span="4">
                             <el-form-item label="账单日期" prop="createTime">
                                 <el-date-picker v-model="form.createTime" :clearable="false" style="width: 100%;"
-                                    type="date" size="small" value-format="yyyy-MM-dd HH:mm:ss" :disabled="buttonDisable"
-                                    placeholder="选择账单日期">
+                                    type="date" size="small" value-format="yyyy-MM-dd HH:mm:ss"
+                                    :disabled="buttonDisable" placeholder="选择账单日期">
                                 </el-date-picker>
                             </el-form-item>
                         </el-col>
 
                         <el-col :span="5">
                             <el-form-item label="船名" prop="vesselCnName">
-                                <el-input style="width: 100%;" v-model="form.vesselCnName" size="small" autocomplete="off"
-                                    :disabled="true" clearable placeholder="船名">
+                                <el-input style="width: 100%;" v-model="form.vesselCnName" size="small"
+                                    autocomplete="off" :disabled="true" clearable placeholder="船名">
                                 </el-input>
                             </el-form-item>
                         </el-col>
@@ -152,15 +154,15 @@
                         </el-col>
                         <el-col :span="5">
                             <el-form-item label="毛重" prop="grossWeight">
-                                <el-input style="width: 100%;" v-model="form.grossWeight" size="small" autocomplete="off"
-                                    :disabled="true" clearable placeholder="毛重">
+                                <el-input style="width: 100%;" v-model="form.grossWeight" size="small"
+                                    autocomplete="off" :disabled="true" clearable placeholder="毛重">
                                 </el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="5">
                             <el-form-item label="尺码" prop="measurement">
-                                <el-input style="width: 100%;" v-model="form.measurement" size="small" autocomplete="off"
-                                    :disabled="true" clearable placeholder="尺码">
+                                <el-input style="width: 100%;" v-model="form.measurement" size="small"
+                                    autocomplete="off" :disabled="true" clearable placeholder="尺码">
                                 </el-input>
                             </el-form-item>
                         </el-col>
@@ -171,6 +173,13 @@
                                 </el-input>
                             </el-form-item>
                         </el-col>
+                             <el-col :span="6">
+                            <el-form-item label="业务部门" prop="createDeptName">
+                                <el-input style="width: 100%;" v-model="form.createDeptName" size="small"
+                                    autocomplete="off" :disabled="true" clearable placeholder="业务部门">
+                                </el-input>
+                            </el-form-item>
+                        </el-col>
                         <el-col :span="10">
                             <el-form-item label="原业务备注" prop="origRemarks">
                                 <el-input style="width: 100%;" v-model="form.origRemarks" type="textarea" size="small"
@@ -185,7 +194,7 @@
                                 </el-input>
                             </el-form-item>
                         </el-col>
-                        <el-col :span="6">
+                        <el-col :offset="18" :span="6">
                             <el-form-item label-width="50px">
                                 <el-button size="small" type="warning" style="margin-right: 8px" :disabled="form.id"
                                     :loading="saveLoading" @click="emptyConditionfun">一键清空
@@ -243,8 +252,8 @@
         <el-dialog title="选择数据" class="el-dialogDeep" :visible.sync="retrievePopupsType" append-to-body width="70%"
             :close-on-click-modal="false">
             <div>
-                <avue-crud :option="retrievePopupsOption" :data="retrievePopupsData" ref="retrievePopupsRef" id="out-table"
-                    :header-cell-class-name="headerClassName">
+                <avue-crud :option="retrievePopupsOption" :data="retrievePopupsData" ref="retrievePopupsRef"
+                    id="out-table" :header-cell-class-name="headerClassName">
                     <template slot="menu" slot-scope="{ row }">
                         <el-button type="text" icon="" size="small" @click.stop="retrievePopupsSelect(row)">选择
                         </el-button>
@@ -274,7 +283,8 @@
                             id="out-table" :header-cell-class-name="headerClassName" :row-style="{ height: '20px' }"
                             :cell-style="{ padding: '0px' }">
                             <template slot-scope="scope" slot="menu">
-                                <el-button type="text" size="small" @click="dialogPreviewfun(scope.row)">打印预览</el-button>
+                                <el-button type="text" size="small"
+                                    @click="dialogPreviewfun(scope.row)">打印预览</el-button>
                             </template>
                         </avue-crud>
                     </el-col>
@@ -286,8 +296,8 @@
         </el-dialog>
 
         <!--预览-->
-        <el-dialog title="打印" :visible.sync="selectPrintingDialog" append-to-body width="70%" :close-on-click-modal="false"
-            :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
+        <el-dialog title="打印" :visible.sync="selectPrintingDialog" append-to-body width="70%"
+            :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
             <div>
                 <reportformsList ref="reportformsList" @reportRadio="reportRadio"></reportformsList>
             </div>
@@ -831,14 +841,15 @@ export default {
             this.form.eta = row.eta ? row.eta.slice(0, 10) + ' 00:00:00' : null
             this.form.businessType = 'TRUCKA'
             this.form.createTime = dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00' // 制单日期 默认 当天,
-
+            this.form.createDept = row.accDept
+            this.form.createDeptName = row.accDeptName
             delete this.form.id
             delete this.form.status
             delete this.form.id
             // delete this.form.createUser
             // delete this.form.createUserName
-            delete this.form.createDept
-            delete this.form.createDeptName
+            // delete this.form.createDept
+            // delete this.form.createDeptName
             // delete this.form.createTime
             delete this.form.updateUser
             delete this.form.updateUserName
@@ -1038,7 +1049,7 @@ export default {
             // 判断必填项
             let sum = '请输入'
             for (let item of this.form.feeCenterList) {
-                let i=1
+                let i = 1
                 if (!item.dc) {
                     sum += ` 应收序号${i}收/付`
                 }
@@ -1504,7 +1515,8 @@ export default {
     font-size: 16px;
     color: #54BCBD;
 }
-::v-deep .el-card__body{
+
+::v-deep .el-card__body {
     padding: 6px 20px;
 }
 </style>

src/views/iosBasicData/report-container/report-container-los.vue

@@ -12,7 +12,7 @@
     :fullscreen="true"
   >
     <div id="reportContainer" style="width: 100%; height: 78vh; padding: 0"></div>
-      <div class="slotDiv">
+      <div class="slotDiv" v-if="butShow">
           <div style="width: 80%;padding: 15px;box-sizing: border-box;box-shadow:1px 2px 8px rgba(0,0,0,.5)">
               <slot></slot>
           </div>
@@ -39,6 +39,10 @@ export default {
     reportId: {
       type: String
     },
+    butShow: {
+      type: Boolean,
+      default: true
+    },
   },
   methods: {
     cellStyle() {

src/views/iosBasicData/reportClose/AEAmendClose/detailsPage.vue

@@ -65,8 +65,8 @@
                         </el-col>
                         <el-col :span="6">
                             <el-form-item label="核销单号" prop="writeOffNo">
-                                <el-input style="width: 100%;" v-model="form.writeOffNo" :disabled="true"
-                                    size="small" autocomplete="off" clearable placeholder="请输入核销单号">
+                                <el-input style="width: 100%;" v-model="form.writeOffNo" :disabled="true" size="small"
+                                    autocomplete="off" clearable placeholder="请输入核销单号">
                                 </el-input>
                             </el-form-item>
                         </el-col>
@@ -173,6 +173,13 @@
                                 </el-input>
                             </el-form-item>
                         </el-col>
+                        <el-col :span="6">
+                            <el-form-item label="业务部门" prop="createDeptName">
+                                <el-input style="width: 100%;" v-model="form.createDeptName" size="small"
+                                    autocomplete="off" :disabled="true" clearable placeholder="业务部门">
+                                </el-input>
+                            </el-form-item>
+                        </el-col>
                         <el-col :span="10">
                             <el-form-item label="原业务备注" prop="origRemarks">
                                 <el-input style="width: 100%;" v-model="form.origRemarks" type="textarea" size="small"
@@ -187,7 +194,7 @@
                                 </el-input>
                             </el-form-item>
                         </el-col>
-                        <el-col :span="6">
+                        <el-col :offset="18" :span="6">
                             <el-form-item label-width="50px">
                                 <el-button size="small" type="warning" style="margin-right: 8px" :disabled="form.id"
                                     :loading="saveLoading" @click="emptyConditionfun">一键清空
@@ -833,14 +840,15 @@ export default {
             this.form.eta = row.eta ? row.eta.slice(0, 10) + ' 00:00:00' : null
             this.form.businessType = 'BGAEA'
             this.form.createTime = dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00' // 制单日期 默认 当天,
-
+            this.form.createDept = row.accDept
+            this.form.createDeptName = row.accDeptName
             delete this.form.id
             delete this.form.status
             delete this.form.id
             // delete this.form.createUser
             // delete this.form.createUserName
-            delete this.form.createDept
-            delete this.form.createDeptName
+            // delete this.form.createDept
+            // delete this.form.createDeptName
             // delete this.form.createTime
             delete this.form.updateUser
             delete this.form.updateUserName

src/views/iosBasicData/reportClose/AEreportClose/index.vue

@@ -982,6 +982,9 @@ export default {
         addbtnfun() {
             this.detailData.seeDisabled = false
             this.isShow = false
+            this.$nextTick(() => {
+                this.$refs.bgdetails.userGetListfun()
+            })
         },
         // 搜索
         searchChange(params, done) {

src/views/iosBasicData/reportClose/AIAmendClose/detailsPage.vue

@@ -65,8 +65,8 @@
                         </el-col>
                         <el-col :span="6">
                             <el-form-item label="核销单号" prop="writeOffNo">
-                                <el-input style="width: 100%;" v-model="form.writeOffNo" :disabled="true"
-                                    size="small" autocomplete="off" clearable placeholder="请输入核销单号">
+                                <el-input style="width: 100%;" v-model="form.writeOffNo" :disabled="true" size="small"
+                                    autocomplete="off" clearable placeholder="请输入核销单号">
                                 </el-input>
                             </el-form-item>
                         </el-col>
@@ -173,6 +173,13 @@
                                 </el-input>
                             </el-form-item>
                         </el-col>
+                        <el-col :span="6">
+                            <el-form-item label="业务部门" prop="createDeptName">
+                                <el-input style="width: 100%;" v-model="form.createDeptName" size="small"
+                                    autocomplete="off" :disabled="true" clearable placeholder="业务部门">
+                                </el-input>
+                            </el-form-item>
+                        </el-col>
                         <el-col :span="10">
                             <el-form-item label="原业务备注" prop="origRemarks">
                                 <el-input style="width: 100%;" v-model="form.origRemarks" type="textarea" size="small"
@@ -187,7 +194,7 @@
                                 </el-input>
                             </el-form-item>
                         </el-col>
-                        <el-col :span="6">
+                        <el-col :offset="18" :span="6">
                             <el-form-item label-width="50px">
                                 <el-button size="small" type="warning" style="margin-right: 8px" :disabled="form.id"
                                     :loading="saveLoading" @click="emptyConditionfun">一键清空
@@ -833,14 +840,15 @@ export default {
             this.form.eta = row.eta ? row.eta.slice(0, 10) + ' 00:00:00' : null
             this.form.businessType = 'BGAIA'
             this.form.createTime = dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00' // 制单日期 默认 当天,
-
+            this.form.createDept = row.accDept
+            this.form.createDeptName = row.accDeptName
             delete this.form.id
             delete this.form.status
             delete this.form.id
             // delete this.form.createUser
             // delete this.form.createUserName
-            delete this.form.createDept
-            delete this.form.createDeptName
+            // delete this.form.createDept
+            // delete this.form.createDeptName
             // delete this.form.createTime
             delete this.form.updateUser
             delete this.form.updateUserName

src/views/iosBasicData/reportClose/AIreportClose/index.vue

@@ -985,6 +985,9 @@ export default {
         addbtnfun() {
             this.detailData.seeDisabled = false
             this.isShow = false
+            this.$nextTick(() => {
+                this.$refs.bgdetails.userGetListfun()
+            })
         },
         // 搜索
         searchChange(params, done) {

src/views/iosBasicData/reportClose/SEAmendClose/detailsPage.vue

@@ -65,8 +65,8 @@
                         </el-col>
                         <el-col :span="6">
                             <el-form-item label="核销单号" prop="writeOffNo">
-                                <el-input style="width: 100%;" v-model="form.writeOffNo" :disabled="true"
-                                    size="small" autocomplete="off" clearable placeholder="请输入核销单号">
+                                <el-input style="width: 100%;" v-model="form.writeOffNo" :disabled="true" size="small"
+                                    autocomplete="off" clearable placeholder="请输入核销单号">
                                 </el-input>
                             </el-form-item>
                         </el-col>
@@ -173,6 +173,13 @@
                                 </el-input>
                             </el-form-item>
                         </el-col>
+                        <el-col :span="6">
+                            <el-form-item label="业务部门" prop="createDeptName">
+                                <el-input style="width: 100%;" v-model="form.createDeptName" size="small"
+                                    autocomplete="off" :disabled="true" clearable placeholder="业务部门">
+                                </el-input>
+                            </el-form-item>
+                        </el-col>
                         <el-col :span="10">
                             <el-form-item label="原业务备注" prop="origRemarks">
                                 <el-input style="width: 100%;" v-model="form.origRemarks" type="textarea" size="small"
@@ -187,7 +194,7 @@
                                 </el-input>
                             </el-form-item>
                         </el-col>
-                        <el-col :span="6">
+                        <el-col :offset="18" :span="6">
                             <el-form-item label-width="50px">
                                 <el-button size="small" type="warning" style="margin-right: 8px" :disabled="form.id"
                                     :loading="saveLoading" @click="emptyConditionfun">一键清空
@@ -833,14 +840,15 @@ export default {
             this.form.eta = row.eta ? row.eta.slice(0, 10) + ' 00:00:00' : null
             this.form.businessType = 'BGSEA'
             this.form.createTime = dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00' // 制单日期 默认 当天,
-
+            this.form.createDept = row.accDept
+            this.form.createDeptName = row.accDeptName
             delete this.form.id
             delete this.form.status
             delete this.form.id
             // delete this.form.createUser
             // delete this.form.createUserName
-            delete this.form.createDept
-            delete this.form.createDeptName
+            // delete this.form.createDept
+            // delete this.form.createDeptName
             // delete this.form.createTime
             delete this.form.updateUser
             delete this.form.updateUserName

src/views/iosBasicData/reportClose/SEreportClose/index.vue

@@ -932,6 +932,9 @@ export default {
         addbtnfun() {
             this.detailData.seeDisabled = false
             this.isShow = false
+            this.$nextTick(() => {
+                this.$refs.bgdetails.userGetListfun()
+            })
         },
         // 搜索
         searchChange(params, done) {

src/views/iosBasicData/reportClose/SIAmendClose/detailsPage.vue

@@ -65,8 +65,8 @@
                         </el-col>
                         <el-col :span="6">
                             <el-form-item label="核销单号" prop="writeOffNo">
-                                <el-input style="width: 100%;" v-model="form.writeOffNo" :disabled="true"
-                                    size="small" autocomplete="off" clearable placeholder="请输入核销单号">
+                                <el-input style="width: 100%;" v-model="form.writeOffNo" :disabled="true" size="small"
+                                    autocomplete="off" clearable placeholder="请输入核销单号">
                                 </el-input>
                             </el-form-item>
                         </el-col>
@@ -173,6 +173,13 @@
                                 </el-input>
                             </el-form-item>
                         </el-col>
+                        <el-col :span="6">
+                            <el-form-item label="业务部门" prop="createDeptName">
+                                <el-input style="width: 100%;" v-model="form.createDeptName" size="small"
+                                    autocomplete="off" :disabled="true" clearable placeholder="业务部门">
+                                </el-input>
+                            </el-form-item>
+                        </el-col>
                         <el-col :span="10">
                             <el-form-item label="原业务备注" prop="origRemarks">
                                 <el-input style="width: 100%;" v-model="form.origRemarks" type="textarea" size="small"
@@ -187,7 +194,7 @@
                                 </el-input>
                             </el-form-item>
                         </el-col>
-                        <el-col :span="6">
+                        <el-col :offset="18" :span="6">
                             <el-form-item label-width="50px">
                                 <el-button size="small" type="warning" style="margin-right: 8px" :disabled="form.id"
                                     :loading="saveLoading" @click="emptyConditionfun">一键清空
@@ -833,14 +840,15 @@ export default {
             this.form.eta = row.eta ? row.eta.slice(0, 10) + ' 00:00:00' : null
             this.form.businessType = 'BGSIA'
             this.form.createTime = dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00' // 制单日期 默认 当天,
-
+            this.form.createDept = row.accDept
+            this.form.createDeptName = row.accDeptName
             delete this.form.id
             delete this.form.status
             delete this.form.id
             // delete this.form.createUser
             // delete this.form.createUserName
-            delete this.form.createDept
-            delete this.form.createDeptName
+            // delete this.form.createDept
+            // delete this.form.createDeptName
             // delete this.form.createTime
             delete this.form.updateUser
             delete this.form.updateUserName

src/views/iosBasicData/reportClose/SIreportClose/index.vue

@@ -883,7 +883,7 @@ export default {
             }).then(() => {
                 this.loading = true;
                 gmyImportDecl(obj).then(res => {
-                        this.$message({
+                    this.$message({
                         dangerouslyUseHTMLString: true,
                         message: res.data.msg,
                         type: 'success'
@@ -981,6 +981,9 @@ export default {
         addbtnfun() {
             this.detailData.seeDisabled = false
             this.isShow = false
+            this.$nextTick(() => {
+                this.$refs.bgdetails.userGetListfun()
+            })
         },
         // 搜索
         searchChange(params, done) {

src/views/iosBasicData/seamends/amendsDetails.vue

@@ -14,8 +14,9 @@
                     v-if="roleName.indexOf('admin') != -1 ? true : roleName.indexOf('报表管理') != -1 ? true : false"
                     :loading="saveLoading" :disabled="!form.id" @click="DesignreportDialog = true">报表设计
                 </el-button>
-                <el-button size="small" type="success" style="margin-right: 8px" v-if="form.status == 0 || form.status == 4"
-                    :disabled="!form.id || editPower" :loading="saveLoading" @click="submitforApproval">提交请核
+                <el-button size="small" type="success" style="margin-right: 8px"
+                    v-if="form.status == 0 || form.status == 4" :disabled="!form.id || editPower" :loading="saveLoading"
+                    @click="submitforApproval">提交请核
                 </el-button>
                 <el-button size="small" type="warning" plain v-if="form.status == 1" :disabled="!form.id || editPower"
                     :loading="saveLoading" @click="revokepleaseReview">撤销请核
@@ -33,22 +34,22 @@
                     <el-row>
                         <el-col :span="5">
                             <el-form-item label="原M B/L NO" prop="mblno">
-                                <el-input style="width: 100%;" v-model="form.mblno" :disabled="buttonDisable" size="small"
-                                    autocomplete="off" clearable placeholder="请输入原M B/L NO">
+                                <el-input style="width: 100%;" v-model="form.mblno" :disabled="buttonDisable"
+                                    size="small" autocomplete="off" clearable placeholder="请输入原M B/L NO">
                                 </el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="5">
                             <el-form-item label="原H B/L NO" prop="hblno">
-                                <el-input style="width: 100%;" v-model="form.hblno" :disabled="buttonDisable" size="small"
-                                    autocomplete="off" clearable placeholder="请输入原H B/L NO">
+                                <el-input style="width: 100%;" v-model="form.hblno" :disabled="buttonDisable"
+                                    size="small" autocomplete="off" clearable placeholder="请输入原H B/L NO">
                                 </el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="5">
                             <el-form-item label="原外提单号" prop="refno">
-                                <el-input style="width: 100%;" v-model="form.refno" :disabled="buttonDisable" size="small"
-                                    autocomplete="off" clearable placeholder="请输入原外提单号">
+                                <el-input style="width: 100%;" v-model="form.refno" :disabled="buttonDisable"
+                                    size="small" autocomplete="off" clearable placeholder="请输入原外提单号">
                                 </el-input>
                             </el-form-item>
                         </el-col>
@@ -72,23 +73,24 @@
                         <el-col :span="10">
                             <el-col :span="15">
                                 <el-form-item label="客户名称" prop="corpCnName">
-                                    <el-input style="width: 100%;" v-model="form.corpCnName" size="small" autocomplete="off"
-                                        :disabled="true" clearable placeholder="客户名称">
+                                    <el-input style="width: 100%;" v-model="form.corpCnName" size="small"
+                                        autocomplete="off" :disabled="true" clearable placeholder="客户名称">
                                     </el-input>
                                 </el-form-item>
                             </el-col>
                             <el-col :span="9">
                                 <el-form-item label="" prop="corpEnName" label-width="5px">
-                                    <el-input style="width: 100%;" v-model="form.corpEnName" size="small" autocomplete="off"
-                                        :disabled="true" clearable placeholder="客户名称">
+                                    <el-input style="width: 100%;" v-model="form.corpEnName" size="small"
+                                        autocomplete="off" :disabled="true" clearable placeholder="客户名称">
                                     </el-input>
                                 </el-form-item>
                             </el-col>
                         </el-col>
                         <el-col :span="5">
                             <el-form-item label="业务类型" prop="businessType">
-                                <search-query :datalist="origSeaTypeData" :selectValue="form.origSeaType" :filterable="true"
-                                    :disabled="true" :clearable="true" :buttonIf="false" placeholder="业务类型">
+                                <search-query :datalist="origSeaTypeData" :selectValue="form.origSeaType"
+                                    :filterable="true" :disabled="true" :clearable="true" :buttonIf="false"
+                                    placeholder="业务类型">
                                 </search-query>
                             </el-form-item>
                         </el-col>
@@ -102,16 +104,16 @@
                         <el-col :span="4">
                             <el-form-item label="账单日期" prop="createTime">
                                 <el-date-picker v-model="form.createTime" :clearable="false" style="width: 100%;"
-                                    type="date" size="small" value-format="yyyy-MM-dd HH:mm:ss" :disabled="buttonDisable"
-                                    placeholder="选择账单日期">
+                                    type="date" size="small" value-format="yyyy-MM-dd HH:mm:ss"
+                                    :disabled="buttonDisable" placeholder="选择账单日期">
                                 </el-date-picker>
                             </el-form-item>
                         </el-col>
 
                         <el-col :span="5">
                             <el-form-item label="船名" prop="vesselCnName">
-                                <el-input style="width: 100%;" v-model="form.vesselCnName" size="small" autocomplete="off"
-                                    :disabled="true" clearable placeholder="船名">
+                                <el-input style="width: 100%;" v-model="form.vesselCnName" size="small"
+                                    autocomplete="off" :disabled="true" clearable placeholder="船名">
                                 </el-input>
                             </el-form-item>
                         </el-col>
@@ -152,15 +154,15 @@
                         </el-col>
                         <el-col :span="5">
                             <el-form-item label="毛重" prop="grossWeight">
-                                <el-input style="width: 100%;" v-model="form.grossWeight" size="small" autocomplete="off"
-                                    :disabled="true" clearable placeholder="毛重">
+                                <el-input style="width: 100%;" v-model="form.grossWeight" size="small"
+                                    autocomplete="off" :disabled="true" clearable placeholder="毛重">
                                 </el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="5">
                             <el-form-item label="尺码" prop="measurement">
-                                <el-input style="width: 100%;" v-model="form.measurement" size="small" autocomplete="off"
-                                    :disabled="true" clearable placeholder="尺码">
+                                <el-input style="width: 100%;" v-model="form.measurement" size="small"
+                                    autocomplete="off" :disabled="true" clearable placeholder="尺码">
                                 </el-input>
                             </el-form-item>
                         </el-col>
@@ -171,6 +173,13 @@
                                 </el-input>
                             </el-form-item>
                         </el-col>
+                        <el-col :span="5">
+                            <el-form-item label="业务部门" prop="createDeptName">
+                                <el-input style="width: 100%;" v-model="form.createDeptName" size="small"
+                                    autocomplete="off" :disabled="true" clearable placeholder="业务部门">
+                                </el-input>
+                            </el-form-item>
+                        </el-col>
                         <el-col :span="10">
                             <el-form-item label="原业务备注" prop="origRemarks">
                                 <el-input style="width: 100%;" v-model="form.origRemarks" type="textarea" size="small"
@@ -185,7 +194,7 @@
                                 </el-input>
                             </el-form-item>
                         </el-col>
-                        <el-col :span="6">
+                        <el-col :offset="18" :span="6">
                             <el-form-item label-width="50px">
                                 <el-button size="small" type="warning" style="margin-right: 8px" :disabled="form.id"
                                     :loading="saveLoading" @click="emptyConditionfun">一键清空
@@ -216,8 +225,9 @@
                             <i class="el-icon-coin"></i>
                             <span>应收费用</span>
                         </div>
-                        <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="primary"
-                            plain size="small" :disabled="buttonDisable" @click="upwardAddfun('D')">生成amend费用
+                        <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1"
+                            type="primary" plain size="small" :disabled="buttonDisable"
+                            @click="upwardAddfun('D')">生成amend费用
                         </el-button>
                     </div>
                     <billgenerated :tableData="this.form.feeCenterListD" :handleSelectionData="multipleChoiceDArr"
@@ -230,8 +240,9 @@
                             <i class="el-icon-coin"></i>
                             <span>应付费用</span>
                         </div>
-                        <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="primary"
-                            plain size="small" :disabled="buttonDisable" @click="upwardAddfun('C')">生成amend费用
+                        <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1"
+                            type="primary" plain size="small" :disabled="buttonDisable"
+                            @click="upwardAddfun('C')">生成amend费用
                         </el-button>
                     </div>
                     <billgenerated :tableData="this.form.feeCenterListC" :handleSelectionData="multipleChoiceCArr"
@@ -244,8 +255,8 @@
         <el-dialog title="选择数据" class="el-dialogDeep" :visible.sync="retrievePopupsType" append-to-body width="70%"
             :close-on-click-modal="false">
             <div>
-                <avue-crud :option="retrievePopupsOption" :data="retrievePopupsData" ref="retrievePopupsRef" id="out-table"
-                    :header-cell-class-name="headerClassName">
+                <avue-crud :option="retrievePopupsOption" :data="retrievePopupsData" ref="retrievePopupsRef"
+                    id="out-table" :header-cell-class-name="headerClassName">
                     <template slot="menu" slot-scope="{ row }">
                         <el-button type="text" icon="" size="small" @click.stop="retrievePopupsSelect(row)">选择
                         </el-button>
@@ -275,7 +286,8 @@
                             id="out-table" :header-cell-class-name="headerClassName" :row-style="{ height: '20px' }"
                             :cell-style="{ padding: '0px' }">
                             <template slot-scope="scope" slot="menu">
-                                <el-button type="text" size="small" @click="dialogPreviewfun(scope.row)">打印预览</el-button>
+                                <el-button type="text" size="small"
+                                    @click="dialogPreviewfun(scope.row)">打印预览</el-button>
                             </template>
                         </avue-crud>
                     </el-col>
@@ -287,8 +299,8 @@
         </el-dialog>
 
         <!--预览-->
-        <el-dialog title="打印" :visible.sync="selectPrintingDialog" append-to-body width="70%" :close-on-click-modal="false"
-            :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
+        <el-dialog title="打印" :visible.sync="selectPrintingDialog" append-to-body width="70%"
+            :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
             <div>
                 <reportformsList ref="reportformsList" @reportRadio="reportRadio"></reportformsList>
             </div>
@@ -316,6 +328,7 @@ import { getList as reportsList } from "@/api/iosBasicData/reports";
 import {
     getFeeCenterCorpIds
 } from "@/api/iosBasicData/feecenter";
+import { getList as userGetList } from '@/api/system/user'
 import TreeSelect from "@/components/iosbasic-data/TreeSelect.vue";
 import { reportsGetReportData } from "@/api/iosBasicData/reports";
 import reportContainer from "@/views/iosBasicData/report-container/report-container.vue";
@@ -430,12 +443,16 @@ export default {
             saveLoading: false, // 按钮加载动画
             // 选择的数据
             form: {
+                // operatorName: JSON.parse(localStorage.getItem('saber-userInfo')).content.user_name, // OP 默认登录人
+                // operatorId: JSON.parse(localStorage.getItem('saber-userInfo')).content.user_id, // OP 默认登录人
                 createTime: dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00', // 制单日期 默认 当天,
                 feeCenterListD: [],
                 feeCenterListC: [],
                 feeCenterList: []
             },
             oldForm: {
+                // operatorName: JSON.parse(localStorage.getItem('saber-userInfo')).content.user_name, // OP 默认登录人
+                // operatorId: JSON.parse(localStorage.getItem('saber-userInfo')).content.user_id, // OP 默认登录人
                 createTime: dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00', // 制单日期 默认 当天,
                 feeCenterListD: [],
                 feeCenterListC: [],
@@ -553,8 +570,22 @@ export default {
         this.roleName = localStorage.getItem('roleName').split(',')
         // 获取当前登录人个人信息
         this.saberUserInfo = JSON.parse(localStorage.getItem('saber-userInfo')).content
+        // if (!this.form.id) {
+        //     this.userGetListfun() // 获取用户管理数据
+        // }
     },
     methods: {
+        // 获取用户管理数据
+        userGetListfun() {
+            userGetList(1, 10, { account: this.form.operatorName }, JSON.parse(localStorage.getItem('saber-userInfo')).content.dept_pid.split(',')[0]).then(res => {
+                for (let item of res.data.data.records) {
+                    if (item.name == this.form.operatorName) {
+                        this.$set(this.form, 'createDeptName', item.deptName)
+                        this.$set(this.form, 'createDept', item.deptId)
+                    }
+                }
+            })
+        },
         // 报表预览
         previewreportfun() {
             getreportsList(1, 10, {
@@ -832,14 +863,15 @@ export default {
             this.form.eta = row.eta ? row.eta.slice(0, 10) + ' 00:00:00' : null
             this.form.businessType = 'SEA'
             this.form.createTime = dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00' // 制单日期 默认 当天,
-
+            this.form.createDept=row.accDept
+            this.form.createDeptName=row.accDeptName   
             delete this.form.id
             delete this.form.status
             delete this.form.id
             // delete this.form.createUser
             // delete this.form.createUserName
-            delete this.form.createDept
-            delete this.form.createDeptName
+            // delete this.form.createDept
+            // delete this.form.createDeptName
             // delete this.form.createTime
             delete this.form.updateUser
             delete this.form.updateUserName
@@ -1503,7 +1535,8 @@ export default {
     font-size: 16px;
     color: #54BCBD;
 }
-::v-deep .el-card__body{
+
+::v-deep .el-card__body {
     padding: 6px 20px;
 }
 </style>

src/views/iosBasicData/siamends/amendsDetails.vue

@@ -14,8 +14,9 @@
                     v-if="roleName.indexOf('admin') != -1 ? true : roleName.indexOf('报表管理') != -1 ? true : false"
                     :loading="saveLoading" :disabled="!form.id" @click="DesignreportDialog = true">报表设计
                 </el-button>
-                <el-button size="small" type="success" style="margin-right: 8px" v-if="form.status == 0 || form.status == 4"
-                    :disabled="!form.id || editPower" :loading="saveLoading" @click="submitforApproval">提交请核
+                <el-button size="small" type="success" style="margin-right: 8px"
+                    v-if="form.status == 0 || form.status == 4" :disabled="!form.id || editPower" :loading="saveLoading"
+                    @click="submitforApproval">提交请核
                 </el-button>
                 <el-button size="small" type="warning" plain v-if="form.status == 1" :disabled="!form.id || editPower"
                     :loading="saveLoading" @click="revokepleaseReview">撤销请核
@@ -33,15 +34,15 @@
                     <el-row>
                         <el-col :span="5">
                             <el-form-item label="原M B/L NO" prop="mblno">
-                                <el-input style="width: 100%;" v-model="form.mblno" :disabled="buttonDisable" size="small"
-                                    autocomplete="off" clearable placeholder="请输入原M B/L NO">
+                                <el-input style="width: 100%;" v-model="form.mblno" :disabled="buttonDisable"
+                                    size="small" autocomplete="off" clearable placeholder="请输入原M B/L NO">
                                 </el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="5">
                             <el-form-item label="原H B/L NO" prop="hblno">
-                                <el-input style="width: 100%;" v-model="form.hblno" :disabled="buttonDisable" size="small"
-                                    autocomplete="off" clearable placeholder="请输入原H B/L NO">
+                                <el-input style="width: 100%;" v-model="form.hblno" :disabled="buttonDisable"
+                                    size="small" autocomplete="off" clearable placeholder="请输入原H B/L NO">
                                 </el-input>
                             </el-form-item>
                         </el-col>
@@ -58,23 +59,24 @@
                         <el-col :span="10">
                             <el-col :span="15">
                                 <el-form-item label="客户名称" prop="corpCnName">
-                                    <el-input style="width: 100%;" v-model="form.corpCnName" size="small" autocomplete="off"
-                                        :disabled="true" clearable placeholder="客户名称">
+                                    <el-input style="width: 100%;" v-model="form.corpCnName" size="small"
+                                        autocomplete="off" :disabled="true" clearable placeholder="客户名称">
                                     </el-input>
                                 </el-form-item>
                             </el-col>
                             <el-col :span="9">
                                 <el-form-item label="" prop="corpEnName" label-width="5px">
-                                    <el-input style="width: 100%;" v-model="form.corpEnName" size="small" autocomplete="off"
-                                        :disabled="true" clearable placeholder="客户名称">
+                                    <el-input style="width: 100%;" v-model="form.corpEnName" size="small"
+                                        autocomplete="off" :disabled="true" clearable placeholder="客户名称">
                                     </el-input>
                                 </el-form-item>
                             </el-col>
                         </el-col>
                         <el-col :span="5">
                             <el-form-item label="业务类型" prop="businessType">
-                                <search-query :datalist="origSeaTypeData" :selectValue="form.origSeaType" :filterable="true"
-                                    :disabled="true" :clearable="true" :buttonIf="false" placeholder="业务类型">
+                                <search-query :datalist="origSeaTypeData" :selectValue="form.origSeaType"
+                                    :filterable="true" :disabled="true" :clearable="true" :buttonIf="false"
+                                    placeholder="业务类型">
                                 </search-query>
                             </el-form-item>
                         </el-col>
@@ -88,16 +90,16 @@
                         <el-col :span="4">
                             <el-form-item label="制单日期" prop="createTime">
                                 <el-date-picker v-model="form.createTime" :clearable="false" style="width: 100%;"
-                                    type="date" size="small" value-format="yyyy-MM-dd HH:mm:ss" :disabled="buttonDisable"
-                                    placeholder="选择制单日期">
+                                    type="date" size="small" value-format="yyyy-MM-dd HH:mm:ss"
+                                    :disabled="buttonDisable" placeholder="选择制单日期">
                                 </el-date-picker>
                             </el-form-item>
                         </el-col>
 
                         <el-col :span="5">
                             <el-form-item label="船名" prop="vesselCnName">
-                                <el-input style="width: 100%;" v-model="form.vesselCnName" size="small" autocomplete="off"
-                                    :disabled="true" clearable placeholder="船名">
+                                <el-input style="width: 100%;" v-model="form.vesselCnName" size="small"
+                                    autocomplete="off" :disabled="true" clearable placeholder="船名">
                                 </el-input>
                             </el-form-item>
                         </el-col>
@@ -138,25 +140,32 @@
                         </el-col>
                         <el-col :span="5">
                             <el-form-item label="毛重" prop="grossWeight">
-                                <el-input style="width: 100%;" v-model="form.grossWeight" size="small" autocomplete="off"
-                                    :disabled="true" clearable placeholder="毛重">
+                                <el-input style="width: 100%;" v-model="form.grossWeight" size="small"
+                                    autocomplete="off" :disabled="true" clearable placeholder="毛重">
                                 </el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="5">
                             <el-form-item label="尺码" prop="measurement">
-                                <el-input style="width: 100%;" v-model="form.measurement" size="small" autocomplete="off"
-                                    :disabled="true" clearable placeholder="尺码">
+                                <el-input style="width: 100%;" v-model="form.measurement" size="small"
+                                    autocomplete="off" :disabled="true" clearable placeholder="尺码">
                                 </el-input>
                             </el-form-item>
                         </el-col>
-                        <el-col :span="9">
+                        <el-col :span="5">
                             <el-form-item label="箱型箱量" prop="quantityCntrDescr">
                                 <el-input style="width: 100%;" v-model="form.quantityCntrDescr" size="small"
                                     autocomplete="off" :disabled="true" clearable placeholder="箱型箱量">
                                 </el-input>
                             </el-form-item>
                         </el-col>
+                        <el-col :span="4">
+                            <el-form-item label="业务部门" prop="createDeptName">
+                                <el-input style="width: 100%;" v-model="form.createDeptName" size="small"
+                                    autocomplete="off" :disabled="true" clearable placeholder="业务部门">
+                                </el-input>
+                            </el-form-item>
+                        </el-col>
                         <el-col :span="10">
                             <el-form-item label="原业务备注" prop="origRemarks">
                                 <el-input style="width: 100%;" v-model="form.origRemarks" type="textarea" size="small"
@@ -202,8 +211,9 @@
                             <i class="el-icon-coin"></i>
                             <span>应收费用</span>
                         </div>
-                        <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="primary"
-                            plain size="small" :disabled="buttonDisable" @click="upwardAddfun('D')">生成amend费用
+                        <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1"
+                            type="primary" plain size="small" :disabled="buttonDisable"
+                            @click="upwardAddfun('D')">生成amend费用
                         </el-button>
                     </div>
                     <billgenerated :tableData="this.form.feeCenterListD" :handleSelectionData="multipleChoiceDArr"
@@ -216,8 +226,9 @@
                             <i class="el-icon-coin"></i>
                             <span>应付费用</span>
                         </div>
-                        <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="primary"
-                            plain size="small" :disabled="buttonDisable" @click="upwardAddfun('C')">生成amend费用
+                        <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1"
+                            type="primary" plain size="small" :disabled="buttonDisable"
+                            @click="upwardAddfun('C')">生成amend费用
                         </el-button>
                     </div>
                     <billgenerated :tableData="this.form.feeCenterListC" :handleSelectionData="multipleChoiceCArr"
@@ -230,8 +241,8 @@
         <el-dialog title="选择数据" class="el-dialogDeep" :visible.sync="retrievePopupsType" append-to-body width="70%"
             :close-on-click-modal="false">
             <div>
-                <avue-crud :option="retrievePopupsOption" :data="retrievePopupsData" ref="retrievePopupsRef" id="out-table"
-                    :header-cell-class-name="headerClassName">
+                <avue-crud :option="retrievePopupsOption" :data="retrievePopupsData" ref="retrievePopupsRef"
+                    id="out-table" :header-cell-class-name="headerClassName">
                     <template slot="menu" slot-scope="{ row }">
                         <el-button type="text" size="small" @click.stop="retrievePopupsSelect(row)">选择
                         </el-button>
@@ -262,7 +273,8 @@
                             id="out-table" :header-cell-class-name="headerClassName" :row-style="{ height: '20px' }"
                             :cell-style="{ padding: '0px' }">
                             <template slot-scope="scope" slot="menu">
-                                <el-button type="text" size="small" @click="dialogPreviewfun(scope.row)">打印预览</el-button>
+                                <el-button type="text" size="small"
+                                    @click="dialogPreviewfun(scope.row)">打印预览</el-button>
                             </template>
                         </avue-crud>
                     </el-col>
@@ -274,8 +286,8 @@
         </el-dialog>
 
         <!--预览-->
-        <el-dialog title="打印" :visible.sync="selectPrintingDialog" append-to-body width="70%" :close-on-click-modal="false"
-            :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
+        <el-dialog title="打印" :visible.sync="selectPrintingDialog" append-to-body width="70%"
+            :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
             <div>
                 <reportformsList ref="reportformsList" @reportRadio="reportRadio"></reportformsList>
             </div>
@@ -308,7 +320,7 @@ import reportContainer from "@/views/iosBasicData/report-container/report-contai
 import { getList as getreportsList } from "@/api/iosBasicData/reports";
 import reportformsList from "@/views/iosBasicData/SeafreightExportF/bills/assembly/reportformsList.vue";
 import { contrastObj, contrastList } from "@/util/contrastData";
-
+import { getList as userGetList } from '@/api/system/user'
 export default {
     components: { reportformsList, reportContainer, TreeSelect, reports, SearchQuery, amendsCostdetails, billgenerated },
     data() {
@@ -398,12 +410,16 @@ export default {
             saveLoading: false, // 按钮加载动画
             // 选择的数据
             form: {
+                // operatorName: JSON.parse(localStorage.getItem('saber-userInfo')).content.user_name, // OP 默认登录人
+                // operatorId: JSON.parse(localStorage.getItem('saber-userInfo')).content.user_id, // OP 默认登录人
                 createTime: dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00', // 制单日期 默认 当天,
                 feeCenterListD: [],
                 feeCenterListC: [],
                 feeCenterList: []
             },
             oldForm: {
+                // operatorName: JSON.parse(localStorage.getItem('saber-userInfo')).content.user_name, // OP 默认登录人
+                // operatorId: JSON.parse(localStorage.getItem('saber-userInfo')).content.user_id, // OP 默认登录人
                 createTime: dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00', // 制单日期 默认 当天,
                 feeCenterListD: [],
                 feeCenterListC: [],
@@ -520,8 +536,23 @@ export default {
         this.roleName = localStorage.getItem('roleName').split(',')
         // 获取当前登录人个人信息
         this.saberUserInfo = JSON.parse(localStorage.getItem('saber-userInfo')).content
+        // if (!this.form.id) {
+        //     this.userGetListfun() // 获取用户管理数据
+        // }
     },
     methods: {
+        // 获取用户管理数据
+        userGetListfun(account = undefined, type = false,) {
+            console.log(this.form.operatorName)
+            userGetList(1, 10, { account: this.form.operatorName }, JSON.parse(localStorage.getItem('saber-userInfo')).content.dept_pid.split(',')[0]).then(res => {
+                for (let item of res.data.data.records) {
+                    if (item.name == this.form.operatorName) {
+                        this.$set(this.form, 'createDeptName', item.deptName)
+                        this.$set(this.form, 'createDept', item.deptId)
+                    }
+                }
+            })
+        },
         // 报表预览
         previewreportfun() {
             getreportsList(1, 10, {
@@ -580,7 +611,7 @@ export default {
                 reportCode: this.reportformsObj.classifyCode,
                 groupCode: this.reportformsObj.groupCode,
                 corpIds: row.id,
-                curCode:row.curCode,
+                curCode: row.curCode,
                 type: 'AMEND'
             }).then(res => {
                 this.handleReportPreview(this.reportformsObj.url, res.data.data.data)
@@ -796,14 +827,15 @@ export default {
             this.form.eta = row.eta ? row.eta.slice(0, 10) + ' 00:00:00' : null
             this.form.businessType = 'SIA'
             this.form.createTime = dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00' // 制单日期 默认 当天,
-
+            this.form.createDept = row.accDept
+            this.form.createDeptName = row.accDeptName
             delete this.form.id
             delete this.form.status
             delete this.form.id
             // delete this.form.createUser
             // delete this.form.createUserName
-            delete this.form.createDept
-            delete this.form.createDeptName
+            // delete this.form.createDept
+            // delete this.form.createDeptName
             // delete this.form.createTime
             delete this.form.updateUser
             delete this.form.updateUserName
@@ -1461,7 +1493,8 @@ export default {
     font-size: 16px;
     color: #54BCBD;
 }
-::v-deep .el-card__body{
+
+::v-deep .el-card__body {
     padding: 6px 20px;
 }
 </style>